some tidying of names