Fix All StateKey References