Fixed some types to refer to their 'New' variants