Hotfix for UnderscoreNamingStrategy for 2.3, will be fixed properly in 2.4