few naming fixes