Rationalised the naming of data types