Use component type instead of name in ComponentEvent