(internal) naming fixes