Rename state variables
Variable name edits