modify handler names