Support changing kind names