naming refactoring, state mgmt