Fix state prefixes