naming fixes after review