Rename interface addListener/removeListener of StateMachine to more specific add*Listener/remove*Listener