Tidied up names of things, trying for greater self-consistency