some more naming fixes