Fix code for updated class names and general derp