Last thing before I hit the sheets: Justice League: Cry for Justice #5 is the only issue I have sitting at my desk. It happens to be the one with the text piece & two page origin story for Freddy. The two-pager is titled "The Origin of Shazam!" That's the only point in the entire issue he's called Shazam, though. In the main story, he's only called Freddy by other characters. And this article at CBR has writer James Robinson calling him Freddy Freeman, not Shazam or Captain Marvel. I did not, however, read the entire article but just the team line-up.
"Outside of a dog, a book is man's best friend. Inside of a dog, it's too dark to read." -Groucho Marx
Check out the Secret Headquarters (my store) website! It's a pretty lame website, but I did it myself, so tough noogies
Listen to WOXY.com, it's the future of rock-n-roll!