Updated class name to make more sense.