Altered names of classes. Updated functions in Player