Rename and some more tidying