#337 Improve NamingStrategies