Changed the name of class to reflect what it does