Changed handler names for mimicking RK05 handles