More naming fixes.