HH-44174 more naming fixes