Added Same to DiffType
Renamed DiffType -> Type