Corrects class reference
Updated references and naming