cleanup naming conventions and variable uses from gpr #503

Closed egreenbaum15 closed 8 months ago