tidy up, rename ready for introduction of new data types