[BREAKING CHANGE] Refine variable naming
Summary:
Refining variable naming by making modifier variables for states
indicated by --.
Bug: T147612
Reviewers: Prtksxna, JGirault
Reviewed By: JGirault
Differential Revision: https://phabricator.wikimedia.org/D447