Fix the variables in state-sync so they're a little easier on the eyes