Add controller name to the new generate/extract/device Instrumentation counters.  Without this some of them can get 'lost' by the Instrumentation display framework.
Switch underlying _values from Dictionary to OrderedDictionary.
This will keep the values in the order they were created instead of letting them jump around in the list.