rename TypeDef to Type