Several naming fixes