Small naming fixes.