Tidy up of attribute names where there is also a max value