Fix name kind
more naming fixes
Merge remote-tracking branch 'Hera/Hera' into ENYO-3743