more naming fixes