updating variable names to be consistent
renaming variables to be consistent