Similar to #33086 we have special code for PropertyNamingStrategy that can be removed.

Comment From: wilkinsona

I did this earlier in 70f72583410e8603d14546aeb8e6ec0321014afb referencing #33086.