Changed a few old product names over to open source project names
Clean up contextual menus
Removed #Pragmas that was preventing Context Switching discovered by Kem T.
Manual Merge
Merge