Changed class name so that it was less confusing.