Renamed a few folders to fit the naming scheme of the rest of the directories for consistency's sake.