refactoring: rename, fixes after review