Updated Class and File Names

Updated to fit the project.