small naming refactor