Adding the ability to configure the naming strategy