We were using ImprovedNamingStrategy and we were happy with it, a clean upgrade path from it doesn't exists and so we are sticking with Hibernate 4.x.