Rename state machine methods