re-naming fixes