changing the variable names to match convention