formatting
Refactored *NameMapper