ADMIN: tidy up more names