Clean up some remaining obsolete terminology. refs #2345

Signed-off-by: Daira Hopwood <daira@jacaranda.org>