Add controller name to the new generate/extract/device Instrumentation counters.  Without this some of them can get 'lost' by the Instrumentation display framework.