See if this is still a problem in 5.0 (master) after HHH-7078 is pushed. I'm not really inclined to start chasing problems in these old NamingStrategy impls; the break down so often for a reason.