added names in grammar for function and event
fixed rFSM graph wizard bug