refactor naming some more