Added NamingStrategy