state machine names cleanup + diagrams