Feature/554 custom hh naming