Refactored class names per B Burton.