unify uses of relkit types