HHH-9388 - Default collection table and foreign key names are incorrect in some cases