Allow singular versions of component types

This makes the command line make more sense when you are
looking at the detailed view for a single component