Update Type files as per 1dfd619f070