More naming fixes