Mark attribute 'Type' deprecated, use 'TypeId' now