Revert "Navigator: make state names generic so that they can be used by the FSM visualisation tool later"

This reverts commit 984a815b94709916174f6a0beeb8ae8217a9aed1.
FSM visualisation script: cope with prefixed state names