Did DC drop the "Captain Marvel" name completely?

I know that DC dropped the ball when they didn't secure the rights to the Captain Marvel name and Marvel Comics came along and created their own different character with the same name in the 1960s but hasn't DC finally given up any chance of actually using the name so they changed Captain Marvel's name to Shazam? Or am I mistaken? And wouldn't that be confusing (not to mention dangerous for the Captain if he happened to say his own name during a fight and changed back into Billy Batson?) cause the wizard's name was Shazam and now his name is Shazam also?

And speaking of name changes, I'd hate to have to call upon the Mighty Isis and a bunch of terrorists showed up. Talk about ruining a good name.