Consolidate event namespace logic