changed names in TypedMorphismClass; some changes to Match