MakeNiceName private, updated comments