Minor naming fixes