changed variable names to match standard convention