some naming fixes