Changed variables to reflect  naming convention