Rename and tidy up order of members