Updated some entries to reflect their official names
Merge pull request #1 from GSA-OCSIT/name_tweaks

Updated some entries to reflect their official names