HHH-7904 -  uniform how to use NamingStrategy