Add mkTypeName and mkDataName