Renamed Everything

Made sure the nomenclature followed the guidelines laid out by the
Instructions for Assessment.