change behavior of xh event naming