Minor naming fixes.