HV-907

same same, no? This is what we use in metamodel gen as well. Worked so far. If you feel strongly about it go ahead.