Refactor variable names

GMP-328 is difficult to complete as is. Refactoring all equations and variables for consistency between files.