Refine names and change list to linked-hash-set, for event handling lookup efficiency