Changed method signature to reflect changes to class names.
Changed method signature to reflect changes to class names.
Changed method signature to reflect changes to class names.
Renamed some classes for clarity.