State Machine cleanup

Fixed import, fixed incorrect names.