fix handler names