Short names

Added short names to types, collections, and items.  Includes updates
from controllers down to repositories.
Merge branch 'short-names'