small naming fixes