Fix State names #37