Some more tidying up of names