minor naming fixes and cleanup