Changed name of class to better reflect its purpose