Standardise on use of mode and package names.

Assume this patch is a first draft.  I am sure that it will become
obvious that other changes are necessary to make this work properly.