OOIION-1837: Port get names for events code back to R2
Merge pull request #2011 from mmeisinger/fix1837_event_r2

OOIION-1837: Port get names for events code back to R2