MS-226 Fix merge conflict breakage, and refactor variable names