minor refactor/renaming