We followed the same policy. It worked perfectly well. I think it is better to start from the right name, and overcome any stupidity about being embarassed because one is endowed with ordinary human equipment. Then you can add nicknames on as a frill if you want to.

A