HHH-8217 constraint name fixes for metamodel