Naming refactoring
Continue to refactor names, tests for state machine