Enforce a hint to the state file origins in its name

i.e. Add _switch to the end.