Improved support for UnderscoreNamingStrategy