MapNamingStrategy simplified and refactored