Fix DefaultNamingStrategy changes