fixing pmd in NameManager
pmd changes
more pmd