Small naming fixes