Bubble events change to "on" prefix and tree fixes