The problem is that 30 does not take into account the numbers (and underscores) that Hibernate adds to unique the references. We are going to need to revert this. Maybe we don't have to go all the way back to 10, maybe 15 or 20 is good enough.