simple naming fixes