Cleanup eventNames with Constants and adding Tests for Complementation