Fixed variable names to reflect new class names.