Cleanup for organization and event integration.
Merge pull request #175 from karma-exchange-org/org_event_naming_cleanup

Cleanup for organization and event integration.