tidy up recent changes
rename values