Fix state names