changed variable names to match new class names