changed variable names to match

changed variable names to match