small changes to reflect variable name changes