Implemented proper NamingStrategy