minor naming fixes