[NUI] Rename EventHandler WithReturnType to end in EventHandler