Additionally, NamingStrategy itself will be removed from 5.0 codebase. The calls into it from binding code was so convoluted as to make it impossible to untangle in a way that would maintain backwards compatibility anyway. The new contracts are much better designed IMO.