Fixed state name collision when running in highstate