Changed a few variable names that were legacy from a different project