small naming fixes, etc