Merge pull request #1 from Microsoft/master

Updating Local

45 files changed, 1033 insertions, 212 deletions

diff --git a/usb/UcmCxUcsi/Fdo.cpp b/usb/UcmCxUcsi/Fdo.cpp
index 88aa9129..29f19279 100644
--- a/usb/UcmCxUcsi/Fdo.cpp
+++ b/usb/UcmCxUcsi/Fdo.cpp
@@ -27,6 +27,7 @@ EVT_WDF_DEVICE_D0_ENTRY Fdo_EvtDeviceD0Entry;
 EVT_WDF_DEVICE_D0_EXIT Fdo_EvtDeviceD0Exit;
 EVT_WDF_DEVICE_SELF_MANAGED_IO_INIT Fdo_EvtDeviceSelfManagedIoInit;
 EVT_WDF_DEVICE_SELF_MANAGED_IO_RESTART Fdo_EvtDeviceSelfManagedIoRestart;
+EVT_WDF_WORKITEM Fdo_ConnectorAndNotificationWorkItem;
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 NTSTATUS
@@ -112,8 +113,11 @@ Fdo_Initialize (
     _In_ PFDO_CONTEXT FdoCtx
     )
 {
+    NTSTATUS status;
     WDFDEVICE device;
     WDF_DEVICE_STATE deviceState;
+    WDF_WORKITEM_CONFIG workItemConfig;
+    WDF_OBJECT_ATTRIBUTES attributes;
 
     PAGED_CODE();
 
@@ -130,8 +134,27 @@ Fdo_Initialize (
     deviceState.NotDisableable = WdfFalse;
     WdfDeviceSetDeviceState(device, &deviceState);
 
+	//
+	// Create a workitem that will create connectors and enable notifications 
+	// so that we don't block D0 Entry and thereby boot sequence of the system. 
+	//
+	
+    WDF_WORKITEM_CONFIG_INIT(&workItemConfig, Fdo_ConnectorAndNotificationWorkItem);
+
+    WDF_OBJECT_ATTRIBUTES_INIT(&attributes);
+    attributes.ParentObject = device;
+
+    status = WdfWorkItemCreate(&workItemConfig, &attributes, &FdoCtx->ConnectorAndNotificationWorkItem);
+    if (!NT_SUCCESS(status))
+    {
+        TRACE_ERROR(TRACE_FLAG_FDO, "[Device: 0x%p] WdfWorkItemCreate for ConnectorAndNotificationWorkItem failed - %!STATUS!", device, status);
+        goto Exit;
+    }
+
     TRACE_INFO(TRACE_FLAG_FDO, "[Device: 0x%p] FDO initialized", device);
 
+Exit:
+
     TRACE_FUNC_EXIT(TRACE_FLAG_FDO);
 
     return STATUS_SUCCESS;
@@ -304,44 +327,35 @@ Fdo_EvtDeviceSelfManagedIoInit (
     _In_ WDFDEVICE Device
     )
 {
-    NTSTATUS status;
-    PPPM_CONTEXT ppmCtx;
-    UCM_MANAGER_CONFIG ucmConfig;
+    PFDO_CONTEXT fdoCtx;
 
     PAGED_CODE();
 
     TRACE_FUNC_ENTRY(TRACE_FLAG_FDO);
 
-    ppmCtx = &Fdo_GetContext(Device)->PpmCtx;
+    fdoCtx = Fdo_GetContext(Device);
 
-    //
-    // Since the PPM uses a power-managed queue to handle command requests, self-managed I/O init
-    // is when we can start processing commands.
-    //
+    WdfWorkItemEnqueue(fdoCtx->ConnectorAndNotificationWorkItem);
 
-    UCM_MANAGER_CONFIG_INIT(&ucmConfig);
+    TRACE_FUNC_EXIT(TRACE_FLAG_FDO);
 
-    //
-    // Initialize our device with UCM.
-    //
+    return STATUS_SUCCESS;
+}
 
-    status = UcmInitializeDevice(Device, &ucmConfig);
-    if (!NT_SUCCESS(status))
-    {
-        TRACE_ERROR(TRACE_FLAG_FDO, "[Device: 0x%p] UcmInitializeDevice failed - %!STATUS!", Device, status);
-        goto Exit;
-    }
 
+NTSTATUS
+Fdo_EvtDeviceSelfManagedIoRestart (
+    _In_ WDFDEVICE Device
+    )
+{
+    NTSTATUS status;
+    PPPM_CONTEXT ppmCtx;
 
-    status = Ucm_CreateConnectors(ppmCtx);
-    if (!NT_SUCCESS(status))
-    {
-        goto Exit;
-    }
+    PAGED_CODE();
 
-    //
-    // Connector objects are ready. Now we can enable all notifications.
-    //
+    TRACE_FUNC_ENTRY(TRACE_FLAG_FDO);
+
+    ppmCtx = &Fdo_GetContext(Device)->PpmCtx;
 
     status = Ppm_EnableNotifications(ppmCtx);
     if (!NT_SUCCESS(status))
@@ -356,21 +370,33 @@ Exit:
     return status;
 }
 
-
-NTSTATUS
-Fdo_EvtDeviceSelfManagedIoRestart (
-    _In_ WDFDEVICE Device
-    )
+VOID
+Fdo_ConnectorAndNotificationWorkItem(
+    _In_ WDFWORKITEM WorkItem
+)
 {
     NTSTATUS status;
     PPPM_CONTEXT ppmCtx;
+    PFDO_CONTEXT fdoCtx;
+    WDFDEVICE device;
 
     PAGED_CODE();
 
     TRACE_FUNC_ENTRY(TRACE_FLAG_FDO);
 
-    ppmCtx = &Fdo_GetContext(Device)->PpmCtx;
+    device = (WDFDEVICE)WdfWorkItemGetParentObject(WorkItem);
 
+    fdoCtx = Fdo_GetContext(device);
+    ppmCtx = &fdoCtx->PpmCtx;
+    status = Ucm_CreateConnectors(ppmCtx);
+    if (!NT_SUCCESS(status))
+    {
+        goto Exit;
+    }
+
+    //
+    // Connector objects are ready. Now we can enable all notifications.
+    //
     status = Ppm_EnableNotifications(ppmCtx);
     if (!NT_SUCCESS(status))
     {
@@ -378,8 +404,17 @@ Fdo_EvtDeviceSelfManagedIoRestart (
     }
 
 Exit:
+    //
+    // Failing to create the connectors or enable notifications are both
+    // unrecoverable failures. Attempt to have WDF reload the driver.
+    //
+    if (!NT_SUCCESS(status))
+    {
+        TRACE_ERROR(TRACE_FLAG_FDO, "[Device: 0x%p] Failed to initialize PPM connectors - attempting to restart device.", device);
+        WdfDeviceSetFailed(fdoCtx->WdfDevice, WdfDeviceFailedAttemptRestart);
+    }
 
-    TRACE_FUNC_EXIT(TRACE_FLAG_FDO);
+    TRACE_INFO(TRACE_FLAG_FDO, "[Device: 0x%p] Work item complete.", device);
 
-    return status;
+    TRACE_FUNC_EXIT(TRACE_FLAG_FDO);
 }
diff --git a/usb/UcmCxUcsi/Fdo.h b/usb/UcmCxUcsi/Fdo.h
index c6f2c921..2266df26 100644
--- a/usb/UcmCxUcsi/Fdo.h
+++ b/usb/UcmCxUcsi/Fdo.h
@@ -26,6 +26,7 @@ typedef struct _FDO_CONTEXT
 
     ACPI_CONTEXT AcpiCtx;
     PPM_CONTEXT PpmCtx;
+    WDFWORKITEM ConnectorAndNotificationWorkItem;
 
 } FDO_CONTEXT, *PFDO_CONTEXT;
 
diff --git a/usb/UcmCxUcsi/Ppm.cpp b/usb/UcmCxUcsi/Ppm.cpp
index 522adf27..33be0be9 100644
--- a/usb/UcmCxUcsi/Ppm.cpp
+++ b/usb/UcmCxUcsi/Ppm.cpp
@@ -54,6 +54,7 @@ Ppm_Initialize (
     WDF_IO_QUEUE_CONFIG queueConfig;
     WDF_IO_TARGET_OPEN_PARAMS openParams;
     WDF_WORKITEM_CONFIG workItemConfig;
+    UCM_MANAGER_CONFIG ucmConfig;
 
     PAGED_CODE();
 
@@ -132,6 +133,14 @@ Ppm_Initialize (
         goto Exit;
     }
 
+    UCM_MANAGER_CONFIG_INIT(&ucmConfig);
+    status = UcmInitializeDevice(device, &ucmConfig);
+    if (!NT_SUCCESS(status))
+    {
+        TRACE_ERROR(TRACE_FLAG_PPM, "[Device: 0x%p] UcmInitializeDevice failed - %!STATUS!", device, status);
+        goto Exit;
+    }
+
     TRACE_INFO(TRACE_FLAG_PPM, "[Device: 0x%p] PPM initialized", device);
 
 Exit:
diff --git a/usb/UcmCxUcsi/Ppm.h b/usb/UcmCxUcsi/Ppm.h
index 341c25d4..e83399bf 100644
--- a/usb/UcmCxUcsi/Ppm.h
+++ b/usb/UcmCxUcsi/Ppm.h
@@ -68,7 +68,7 @@ typedef struct _PPM_CONNECTOR_CHANGE_CONTEXT
     LONG InProgress;
     UCM_CHARGING_STATE ChargingState;
     UCM_PD_REQUEST_DATA_OBJECT Rdo;
-    UCM_PD_POWER_DATA_OBJECT Pdos[7];
+    UCM_PD_POWER_DATA_OBJECT Pdos[UCSI_MAX_NUM_PDOS];
     UCHAR PdoCount;
 } PPM_CONNECTOR_CHANGE_CONTEXT, *PPPM_CONNECTOR_CHANGE_CONTEXT;
 
diff --git a/usb/UcmCxUcsi/README.md b/usb/UcmCxUcsi/README.md
index dc6b865d..3ebd5d5d 100644
--- a/usb/UcmCxUcsi/README.md
+++ b/usb/UcmCxUcsi/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: UcmTcpciCx Port Controller Client Driver
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to create a Windows USB Type-C port controller driver using the USB Connector Manager class extension driver (UcmCx).
+    samplefwlink: https://go.microsoft.com/fwlink/p/?linkid=856744
+--->
+
+
 # UcmTcpciCx Port Controller Client Driver
 
 This is a sample driver that shows how to create a Windows USB Type-C port controller driver using the USB Connector Manager class extension driver (UcmCx). The sample is a driver for an embedded controller which is complient with the [USB Type-C Connector System Software Interface (UCSI)](http://www.intel.com/content/www/us/en/io/universal-serial-bus/usb-type-c-ucsi-spec.html).
diff --git a/usb/UcmCxUcsi/UcmCxUcsi.inf b/usb/UcmCxUcsi/UcmCxUcsi.inf
index 604f04ba..c1204c40 100644
--- a/usb/UcmCxUcsi/UcmCxUcsi.inf
+++ b/usb/UcmCxUcsi/UcmCxUcsi.inf
diff --git a/usb/UcmCxUcsi/UcmCxUcsi.vcxproj b/usb/UcmCxUcsi/UcmCxUcsi.vcxproj
index 6a028bd4..6b1efbb1 100644
--- a/usb/UcmCxUcsi/UcmCxUcsi.vcxproj
+++ b/usb/UcmCxUcsi/UcmCxUcsi.vcxproj
@@ -90,6 +90,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.</AdditionalIncludeDirectories>
       <WppEnabled>true</WppEnabled>
       <WppRecorderEnabled>true</WppRecorderEnabled>
       <WppScanConfigurationData>trace.h</WppScanConfigurationData>
@@ -128,4 +129,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/usb/UcmCxUcsi/Ucsi.h b/usb/UcmCxUcsi/Ucsi.h
index 72950d6c..1c03d5a3 100644
--- a/usb/UcmCxUcsi/Ucsi.h
+++ b/usb/UcmCxUcsi/Ucsi.h
@@ -29,7 +29,7 @@ Environment:
 #define UCSI_MAX_NUM_ALT_MODE 0x80
 #define UCSI_MIN_TIME_TO_RESPOND_WITH_BUSY 0x0A
 #define UCSI_GET_ERROR_STATUS_DATA_LENGTH 0x10
-#define UCSI_MAX_NUM_PDOS 0x32 // Table 6-32 Counter parameters PD 2.0 V1.1
+#define UCSI_MAX_NUM_PDOS 0x7 // PD Rev2.0 Ver1.3: "6.2.1.2 Number of Data Objects" and "6.4.1 Capabilities Message"
 
 
 typedef enum _UCSI_COMMAND
diff --git a/usb/UcmTcpciCxClientSample/README.md b/usb/UcmTcpciCxClientSample/README.md
index d3fd73ec..02d043bf 100644
--- a/usb/UcmTcpciCxClientSample/README.md
+++ b/usb/UcmTcpciCxClientSample/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: UcmTcpciCx Port Controller Client Driver
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to create a Windows USB Type-C port controller driver using the USB Connector Manager Type-C Port Controller Interface class extension driver (UcmTcpciCx).
+    samplefwlink: https://go.microsoft.com/fwlink/p/?linkid=856745
+--->
+
+
 # UcmTcpciCx Port Controller Client Driver
 
 This is a skeleton sample driver that shows how to create a Windows USB Type-C port controller driver using the USB Connector Manager Type-C Port Controller Interface class extension driver (UcmTcpciCx). UcmTcpciCx is currently only availble using the Windows Insider program - documentation for UcmTcpciCx will be available at the next release of Windows.
diff --git a/usb/kmdf_enumswitches/README.md b/usb/kmdf_enumswitches/README.md
index d6a7ee9f..dda67616 100644
--- a/usb/kmdf_enumswitches/README.md
+++ b/usb/kmdf_enumswitches/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Sample KMDF Bus Driver for OSR USB-FX2
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to use KMDF as a bus driver using the OSR USB-FX2 device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618000
+--->
+
+
 Sample KMDF Bus Driver for OSR USB-FX2
 ======================================
 
diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
index 52017d13..7336000f 100644
--- a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
+++ b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj
index 3230fc6e..39422319 100644
--- a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj
+++ b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.vcxproj
@@ -99,18 +99,18 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib;$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
@@ -118,18 +118,18 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib;$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
@@ -137,18 +137,18 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib;$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
@@ -156,18 +156,18 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\ntstrsafe.lib;$(DDK_LIB_PATH)\wdmsec.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
   </ItemDefinitionGroup>
@@ -208,7 +208,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
@@ -220,4 +220,4 @@
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/usb/kmdf_fx2/README.md b/usb/kmdf_fx2/README.md
index 0bf65d1d..68666660 100644
--- a/usb/kmdf_fx2/README.md
+++ b/usb/kmdf_fx2/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Sample KMDF Function Driver for OSR USB-FX2
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to use KMDF to perform bulk and interrupt data transfers to a USB device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620313
+--->
+
+
 Sample KMDF Function Driver for OSR USB-FX2
 ===========================================
 
diff --git a/usb/kmdf_fx2/driver/osrusbfx2.vcxproj b/usb/kmdf_fx2/driver/osrusbfx2.vcxproj
index 08cde31a..2bcf6616 100644
--- a/usb/kmdf_fx2/driver/osrusbfx2.vcxproj
+++ b/usb/kmdf_fx2/driver/osrusbfx2.vcxproj
@@ -115,17 +115,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -134,17 +134,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -153,17 +153,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -172,17 +172,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -241,4 +241,4 @@
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/usb/ufxclientsample/README.md b/usb/ufxclientsample/README.md
index ec39fd35..54a2f69f 100644
--- a/usb/ufxclientsample/README.md
+++ b/usb/ufxclientsample/README.md
@@ -1,4 +1,14 @@
-USB Function Client Driver
+<!---
+    name: USB Function Client Driver
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to create a Windows USB function controller driver using the USB function class extension driver (UFX).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620315
+--->
+
+
+USB Function Client Driver
 ==========================
 
 This is a skeleton sample driver that shows how to create a Windows USB function controller driver using the USB function class extension driver (UFX).
diff --git a/usb/ufxclientsample/ufxclientsample.vcxproj b/usb/ufxclientsample/ufxclientsample.vcxproj
index 9d7a21ff..b304b4f6 100644
--- a/usb/ufxclientsample/ufxclientsample.vcxproj
+++ b/usb/ufxclientsample/ufxclientsample.vcxproj
@@ -199,7 +199,7 @@
     <ResourceCompile Include="ufxclientsample.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/umdf2_fx2/README.md b/usb/umdf2_fx2/README.md
index 0d98a5ce..bc2cfba5 100644
--- a/usb/umdf2_fx2/README.md
+++ b/usb/umdf2_fx2/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: Sample Function Driver for OSR USB-FX2 (UMDF Version 2)
+    platform: UMDF2
+    language: cpp
+    category: USB
+    description: Demomstreates a UMDF version 2 driver for the OSR USB-FX2 device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618003
+--->
+
 Sample Function Driver for OSR USB-FX2 (UMDF Version 2)
 =======================================================
 
@@ -55,7 +64,7 @@ Build the sample using MSBuild
 
 As an alternative to building the driver sample in Visual Studio, you can build it in a Visual Studio Command Prompt window. In Visual Studio, on the **Tools** menu, choose **Visual Studio Command Prompt**. In the Visual Studio Command Prompt window, navigate to the folder that has the solution file, umdf2echo.sln. Use the MSBuild command to build the solution. Here is an example:
 
-**msbuild /p:configuration=�Win8 Release� /p:platform=�Win32� umdf2\_fx2.sln**
+**msbuild /p:configuration=�Win8 Release� /p:platform=�Win32� umdf2\_fx2.sln**
 
 For more information about using MSBuild to build a driver package, see [Building a Driver](http://msdn.microsoft.com/en-us/library/windows/hardware/ff554644).
 
diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.vcxproj b/usb/umdf2_fx2/driver/osrusbfx2um.vcxproj
index 72e39bc1..a4209763 100644
--- a/usb/umdf2_fx2/driver/osrusbfx2um.vcxproj
+++ b/usb/umdf2_fx2/driver/osrusbfx2um.vcxproj
@@ -114,17 +114,17 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -135,17 +135,17 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -156,17 +156,17 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -177,17 +177,17 @@
     <ClCompile>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
     </ClCompile>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING;UNICODE;_UNICODE</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -207,4 +207,4 @@
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/usb/umdf_filter_kmdf/README.md b/usb/umdf_filter_kmdf/README.md
index ecc62acd..5eaf3347 100644
--- a/usb/umdf_filter_kmdf/README.md
+++ b/usb/umdf_filter_kmdf/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Sample UMDF Filter above KMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to load a UMDF filter driver as an upper filter driver above the kmdf_fx2 sample driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620316
+--->
+
+
 Sample UMDF Filter above KMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
 ==============================================================================
 
diff --git a/usb/umdf_filter_kmdf/kmdf_driver/osrusbfx2.vcxproj b/usb/umdf_filter_kmdf/kmdf_driver/osrusbfx2.vcxproj
index 2db1f7c1..3974f664 100644
--- a/usb/umdf_filter_kmdf/kmdf_driver/osrusbfx2.vcxproj
+++ b/usb/umdf_filter_kmdf/kmdf_driver/osrusbfx2.vcxproj
@@ -115,17 +115,17 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -134,17 +134,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -153,17 +153,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -172,17 +172,17 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\inc;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);EVENT_TRACING</PreprocessorDefinitions>
     </Midl>
     <Link>
@@ -241,4 +241,4 @@
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilter.vcxproj b/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilter.vcxproj
index f12c647f..13921d4d 100644
--- a/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilter.vcxproj
+++ b/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilter.vcxproj
@@ -266,7 +266,7 @@
     <ResourceCompile Include="OsrUsbFilter.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilterOnKmDriver.inx b/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilterOnKmDriver.inx
index a267e119..6153e18b 100644
--- a/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilterOnKmDriver.inx
+++ b/usb/umdf_filter_kmdf/umdf_filter/WUDFOsrUsbFilterOnKmDriver.inx
diff --git a/usb/umdf_filter_umdf/README.md b/usb/umdf_filter_umdf/README.md
index b0c7970f..f4d3dc26 100644
--- a/usb/umdf_filter_umdf/README.md
+++ b/usb/umdf_filter_umdf/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Sample UMDF Filter above UMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
+    platform: UMDF1
+    language: cpp
+    category: USB
+    description: Demonstrates how to load a UMDF filter driver as an upper filter driver above the umdf_fx2 sample driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618001
+--->
+
+
 Sample UMDF Filter above UMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
 ==============================================================================
 
diff --git a/usb/umdf_filter_umdf/umdf_filter/WUDFOsrUsbFilter.vcxproj b/usb/umdf_filter_umdf/umdf_filter/WUDFOsrUsbFilter.vcxproj
index f12c647f..13921d4d 100644
--- a/usb/umdf_filter_umdf/umdf_filter/WUDFOsrUsbFilter.vcxproj
+++ b/usb/umdf_filter_umdf/umdf_filter/WUDFOsrUsbFilter.vcxproj
@@ -266,7 +266,7 @@
     <ResourceCompile Include="OsrUsbFilter.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/umdf_fx2/README.md b/usb/umdf_fx2/README.md
index 2f7f1ded..4b707cbe 100644
--- a/usb/umdf_fx2/README.md
+++ b/usb/umdf_fx2/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Sample UMDF Function Driver for OSR USB-FX2 (UMDF version 1)
+    platform: UMDF1
+    language: cpp
+    category: USB
+    description: A UMDF driver for the OSR USB-FX2 device that includes a test application, sample device metadata, and supports impersonation and idle power down. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618002
+--->
+
+
 Sample UMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
 ============================================================
 
diff --git a/usb/umdf_fx2/driver/WUDFOsrUsbFx2.vcxproj b/usb/umdf_fx2/driver/WUDFOsrUsbFx2.vcxproj
index 18b66c7f..f0a96388 100644
--- a/usb/umdf_fx2/driver/WUDFOsrUsbFx2.vcxproj
+++ b/usb/umdf_fx2/driver/WUDFOsrUsbFx2.vcxproj
@@ -254,7 +254,7 @@
     <ResourceCompile Include="OsrUsbFx2.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/usbsamp/README.md b/usb/usbsamp/README.md
index 8d9d4d9d..30f46c17 100644
--- a/usb/usbsamp/README.md
+++ b/usb/usbsamp/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Usbsamp Generic USB Driver
+    platform: KMDF
+    language: cpp
+    category: USB
+    description: Demonstrates how to perform full speed, high speed, and SuperSpeed transfers to and from bulk and isochronous endpoints of a generic USB device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618938
+--->
+
+
 Usbsamp Generic USB Driver
 ==========================
 
diff --git a/usb/usbsamp/sys/driver/usbsamp.inx b/usb/usbsamp/sys/driver/usbsamp.inx
index 4dc3fad2..5b16de78 100644
--- a/usb/usbsamp/sys/driver/usbsamp.inx
+++ b/usb/usbsamp/sys/driver/usbsamp.inx
diff --git a/usb/usbsamp/sys/driver/usbsamp.vcxproj b/usb/usbsamp/sys/driver/usbsamp.vcxproj
index ae4b4a66..7a9dec32 100644
--- a/usb/usbsamp/sys/driver/usbsamp.vcxproj
+++ b/usb/usbsamp/sys/driver/usbsamp.vcxproj
@@ -182,7 +182,7 @@
     <ResourceCompile Include="..\usbsamp.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/usbview/README.md b/usb/usbview/README.md
index cd117f82..fe1bbbb1 100644
--- a/usb/usbview/README.md
+++ b/usb/usbview/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: USBView sample application
+    platform: WDM
+    language: cpp
+    category: USB
+    description: Provides an application that allows you to browse all USB controllers and connected USB devices on your system.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=618004
+--->
+
+
 USBView sample application
 ==========================
 
diff --git a/usb/usbview/vndrlist.h b/usb/usbview/vndrlist.h
index aa2db6c6..5e3f69b3 100644
--- a/usb/usbview/vndrlist.h
+++ b/usb/usbview/vndrlist.h
@@ -10,23 +10,23 @@ Abstract:
 
     This header file contains a list of all currently known USB Vendor IDs
     and the vendor name associated with each Vendor ID.
- 
+
 Source:
 
     http://www.usb.org
 
-Environment: 
+Environment:
 
     Kernel & user mode
 
 Revision History:
 
     04-25-97 : created
-    03-28-03 : refreshed with latest list from usb.org 
-    05-04-05 : refreshed with latest list from usb.org 
-    05-02-07 : refreshed with latest list from usb.org 
-    03-19-08 : refreshed with latest list from usb.org 
- 
+    03-28-03 : refreshed with latest list from usb.org
+    05-04-05 : refreshed with latest list from usb.org
+    05-02-07 : refreshed with latest list from usb.org
+    03-19-08 : refreshed with latest list from usb.org
+
 --*/
 
 #ifndef   __VNDRLIST_H__
@@ -35,7 +35,7 @@ Revision History:
 //
 // Vendor ID structure
 //
-typedef struct _VENDOR_ID { 
+typedef struct _VENDOR_ID {
     USHORT  usVendorID;
     PCHAR   szVendor;
 } VENDOR_ID, *PVENDOR_ID;
@@ -47,10 +47,10 @@ typedef struct _VENDOR_ID {
 // This information has not been independently verified and no claims
 // are made here as to its accuracy.
 //
-// 10323 total
+// 10978 total
 //
 VENDOR_ID USBVendorIDs[] =
-{ 
+{
     { 0x0079, "Shenzhen Longshengwei Technology, Co., Ltd."  },
     { 0x013A, "Aimgene Technology Co., Ltd"  },
     { 0x03CC, "GN OTOMETRICS"  },
@@ -61,7 +61,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x03EC, "Iwatsu America Inc."  },
     { 0x03ED, "Mitel Corporation"  },
     { 0x03EE, "Mitsumi"  },
-    { 0x03F0, "Hewlett Packard"  },
+    { 0x03F0, "HP Inc."  },
     { 0x03F1, "Genoa Technology"  },
     { 0x03F2, "Oak Technology, Inc"  },
     { 0x03F3, "Adaptec, Inc."  },
@@ -198,7 +198,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0486, "ASUS Computers Inc."  },
     { 0x0487, "Stewart Connector"  },
     { 0x0488, "Cirque Corporation"  },
-    { 0x0489, "Foxconn / Hon Hai"  },
+    { 0x0489, "Foxconn - Hon Hai"  },
     { 0x048A, "S-MOS Systems, Inc."  },
     { 0x048C, "Alps Electric Ireland Ltd."  },
     { 0x048D, "ITE Tech Inc."  },
@@ -503,7 +503,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x05C5, "Digi International Inc."  },
     { 0x05C6, "Qualcomm, Inc"  },
     { 0x05C7, "Qtronix Corp"  },
-    { 0x05C8, "Foxlink/Cheng Uei Precision Industry Co., Ltd."  },
+    { 0x05C8, "Foxlink/Cheng Uei Precision Industry Co., Ltd"  },
     { 0x05C9, "Semtech"  },
     { 0x05CA, "Ricoh Company Ltd."  },
     { 0x05CB, "PowerVision Technologies Inc."  },
@@ -533,7 +533,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x05E4, "Red Wing Corporation"  },
     { 0x05E5, "Fuji Electric Co., Ltd."  },
     { 0x05E6, "Keithley Instruments"  },
-    { 0x05E7, "EIZO Nanoa Technologies Inc."  },
+    { 0x05E7, "EIZO Nanao Technologies Inc."  },
     { 0x05E8, "ICC, Inc."  },
     { 0x05E9, "Kawasaki Microelectronics America, Inc."  },
     { 0x05EA, "Evergreen Systems International"  },
@@ -600,7 +600,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x062B, "Greatlink Electronics Taiwan Ltd."  },
     { 0x062C, "Institute for Information Industry"  },
     { 0x062D, "Taiwan Tai-Hao Enterprises Co. Ltd."  },
-    { 0x062E, "JPC/MAIN SUPER Inc."  },
+    { 0x062E, "JPC-MAIN SUPER Inc."  },
     { 0x062F, "Sin Sheng Terminal & Machine Inc."  },
     { 0x0630, "ORL"  },
     { 0x0631, "JUJO Electronics Corporation"  },
@@ -713,7 +713,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x06A0, "USB Systems Design"  },
     { 0x06A1, "Alexon Co., Ltd."  },
     { 0x06A2, "Topro Technology Inc."  },
-    { 0x06A3, "Mad Catz Europe Ltd."  },
+    { 0x06A3, "Logitech Europe S.A."  },
     { 0x06A4, "Xiamen Doowell Electron Co., Ltd."  },
     { 0x06A5, "Divio"  },
     { 0x06A7, "MicroStore, Inc."  },
@@ -924,11 +924,11 @@ VENDOR_ID USBVendorIDs[] =
     { 0x077A, "NIDEC SANKYO CORPORATION"  },
     { 0x077B, "Linksys"  },
     { 0x077C, "Forward Electronics Co., Ltd."  },
-    { 0x077D, "Griffin Technology"  },
+    { 0x077D, "Griffin Technology LLC"  },
     { 0x077E, "Softing GmbH"  },
     { 0x077F, "Well Excellent & Most Corp."  },
     { 0x0780, "ORGA Kartensysteme GmbH"  },
-    { 0x0781, "SanDisk Corporation"  },
+    { 0x0781, "Western Digital, Sandisk"  },
     { 0x0782, "Trackerball"  },
     { 0x0783, "C3PO, S.L."  },
     { 0x0784, "Pretec Corporation"  },
@@ -1000,7 +1000,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x07C6, "ShareWave, Inc."  },
     { 0x07C7, "Powertech Industrial Co., Ltd."  },
     { 0x07C8, "B.U.G., Inc."  },
-    { 0x07C9, "Allied Telesyn International"  },
+    { 0x07C9, "Allied Telesis Inc"  },
     { 0x07CA, "AVerMedia Technologies, Inc."  },
     { 0x07CB, "Kingmax Technology Inc."  },
     { 0x07CC, "LIWANLI Innovation Co., Ltd"  },
@@ -1107,7 +1107,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0832, "Kouwell Electronics Corp."  },
     { 0x0833, "Sourcenext Corporation"  },
     { 0x0834, "Ciponic Technology Co., Ltd."  },
-    { 0x0835, "Action Star Enterprise Co., Ltd."  },
+    { 0x0835, "Action Star Technology Co., Ltd."  },
     { 0x0836, "Evertz Microsystems Ltd."  },
     { 0x0837, "Renishaw PLC"  },
     { 0x0838, "Precision MicroControl Corporation"  },
@@ -1165,7 +1165,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x086C, "DeTeWe"  },
     { 0x086D, "ICE Technology"  },
     { 0x086E, "System TALKS Inc."  },
-    { 0x086F, "MEC IMEX INC/HPT"  },
+    { 0x086F, "MEC IMEX INC-HPT"  },
     { 0x0870, "Metricom, Inc."  },
     { 0x0871, "Merge Technologies Inc."  },
     { 0x0872, "Broadxent, Inc."  },
@@ -1174,7 +1174,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0875, "Mecel AB"  },
     { 0x0876, "3M Home Health Systems"  },
     { 0x0877, "Lew Engineering"  },
-    { 0x0878, "SYSTEC Computer Gmbh."  },
+    { 0x0878, "SYSTEC Computer Gmbh"  },
     { 0x0879, "Comtrol Corporation"  },
     { 0x087A, "Getemed GmbH"  },
     { 0x087B, "Cornerstone Peripherals Technology"  },
@@ -1237,7 +1237,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x08B6, "Imagek, Inc."  },
     { 0x08B7, "NATSU Corporation Limited"  },
     { 0x08B8, "J. Gordon Electronic Design, Inc."  },
-    { 0x08B9, "RadioShack Corporation"  },
+    { 0x08B9, "General Wireless Operations Inc"  },
     { 0x08BA, "Fujitsu General Limited"  },
     { 0x08BB, "Texas Instruments Japan"  },
     { 0x08BC, "Dr. G. Schuhfried GmbH"  },
@@ -1416,7 +1416,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x096B, "ML Electronics Ltd."  },
     { 0x096C, "GOPEL electronic GmbH"  },
     { 0x096D, "PennyLan"  },
-    { 0x096E, "Feitian New Technology Co."  },
+    { 0x096E, "Feitian Technologies Co., Ltd."  },
     { 0x096F, "Memory Link"  },
     { 0x0970, "K.S. Vector Co., Ltd."  },
     { 0x0971, "GretagMacbeth AG"  },
@@ -1828,7 +1828,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0B0B, "Datamax Corporation"  },
     { 0x0B0C, "Todos Data System AB"  },
     { 0x0B0D, "Project Lab"  },
-    { 0x0B0E, "GN Netcom"  },
+    { 0x0B0E, "GN Audio"  },
     { 0x0B0F, "AVID Technology"  },
     { 0x0B10, "Pcally"  },
     { 0x0B11, "I Tech Solutions Co., Ltd."  },
@@ -1980,7 +1980,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0BAA, "Dr. Gerhard Schmidt GmbH"  },
     { 0x0BAB, "House Ear Institute"  },
     { 0x0BAC, "Biometric Access Corporation"  },
-    { 0x0BAD, "Lab-Volt Itee"  },
+    { 0x0BAD, "Festo Didactic Ltd/Ltee"  },
     { 0x0BAE, "IGEN International, Inc."  },
     { 0x0BAF, "U.S. Robotics"  },
     { 0x0BB0, "Concord Camera Corp."  },
@@ -2094,7 +2094,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0C1C, "Hang Zhou Silan Microelectronics Co. Ltd"  },
     { 0x0C1D, "Digital Audio Corporation"  },
     { 0x0C1E, "TAKAYA CORP."  },
-    { 0x0C1F, "Ultra Electronics Ltd (Ocean Systems)"  },
+    { 0x0C1F, "Magicard Ltd"  },
     { 0x0C20, "Viditec Inc."  },
     { 0x0C21, "Lunatronic"  },
     { 0x0C22, "TallyGenicom LP"  },
@@ -2219,7 +2219,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0C9A, "Hanool Robotics Corp"  },
     { 0x0C9B, "Jobin Yvon, Inc."  },
     { 0x0C9C, "Brand Innovators"  },
-    { 0x0C9D, "Semtek IP Incorporated"  },
+    { 0x0C9D, "DyOcean"  },
     { 0x0C9E, "PLEXUS MULTIMEDIA PTE LTD"  },
     { 0x0C9F, "Extenex Corporation"  },
     { 0x0CA0, "Robert Bosch GmbH - Automotive Aftermarket"  },
@@ -2263,7 +2263,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0CC7, "Kontron Medical AG"  },
     { 0x0CC8, "Technotools Corporation"  },
     { 0x0CC9, "BroadMAX Technologies, Inc."  },
-    { 0x0CCA, "AMPHENOL"  },
+    { 0x0CCA, "Amphenol Corporation"  },
     { 0x0CCB, "SKNET CORPORATION LTD."  },
     { 0x0CCC, "DOMEX TECHNOLOGY CORPORATION"  },
     { 0x0CCD, "TerraTec Electronic GmbH"  },
@@ -2631,7 +2631,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x0E3E, "Good Technology, Inc."  },
     { 0x0E3F, "AM Group Corp."  },
     { 0x0E40, "Proteq LTDA"  },
-    { 0x0E41, "Line 6"  },
+    { 0x0E41, "Line 6, Inc."  },
     { 0x0E42, "Puretek Industrial Co., Ltd."  },
     { 0x0E43, "Holly Lin International Technology Inc."  },
     { 0x0E44, "Sun-Riseful Technology Co., Ltd."  },
@@ -3148,7 +3148,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1045, "Transiciel Technologies"  },
     { 0x1046, "Hitachi Asahi Electronics Co., Ltd."  },
     { 0x1047, "HOYA CORPORATION Vision Care Company"  },
-    { 0x1048, "Targus Group International"  },
+    { 0x1048, "Targus International LLC"  },
     { 0x1049, "Studio Technologies, Inc."  },
     { 0x104A, "WACOH Corporation"  },
     { 0x104B, "CSM GmbH"  },
@@ -3164,7 +3164,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1055, "Complex Micro Interconnection Co., Ltd."  },
     { 0x1056, "Hsin Chen Ent Co., Ltd."  },
     { 0x1057, "ON Semiconductor"  },
-    { 0x1058, "Western Digital Technologies, Inc."  },
+    { 0x1058, "Western Digital, Branded"  },
     { 0x1059, "Giesecke & Devrient GmbH"  },
     { 0x105A, "DDS, Inc."  },
     { 0x105B, "TOKIWA WEST Co., Ltd."  },
@@ -3175,7 +3175,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1060, "Easthome Industrial Co., Ltd."  },
     { 0x1061, "Cardinal Components Inc."  },
     { 0x1062, "Sumitomo Electric Industries, Ltd."  },
-    { 0x1063, "LPKF Motion & Control GmbH"  },
+    { 0x1063, "LPKF Laser & Electronics AG"  },
     { 0x1064, "INNOPLUS Co., Ltd."  },
     { 0x1065, "ImageQuest Co., Ltd."  },
     { 0x1066, "Eten Information Systems Co., Ltd."  },
@@ -3468,7 +3468,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1186, "Scientec System"  },
     { 0x1187, "Techno Valley Co., Ltd."  },
     { 0x1188, "Bloomberg L.P."  },
-    { 0x1189, "Trisat Industrial Co., Ltd."  },
+    { 0x1189, "Trisat IndTry Computer Co. LTD."  },
     { 0x118A, "KEBA AG"  },
     { 0x118B, "AXIOMTEK Co., Ltd."  },
     { 0x118C, "INFINIT GmbH"  },
@@ -3967,7 +3967,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x137A, "Weldon Technologies, Inc."  },
     { 0x137B, "SCAPS GmbH"  },
     { 0x137C, "Yaskawa Electric Corporation"  },
-    { 0x137D, "Pericom Semiconductor Corp."  },
+    { 0x137D, "Diodes Incorporated"  },
     { 0x137E, "XL Microwave, Inc."  },
     { 0x137F, "Sata Hi Tech Services"  },
     { 0x1380, "Staveley Instruments"  },
@@ -4001,7 +4001,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x139C, "Deltronics"  },
     { 0x139D, "Digisafe Pte. Ltd."  },
     { 0x139E, "Valueplus Inc."  },
-    { 0x139F, "NAGRAVISION SA"  },
+    { 0x139F, "Audio Technology Switzerland SA"  },
     { 0x13A0, "Essilor International"  },
     { 0x13A1, "Canas Co., Ltd."  },
     { 0x13A2, "Pesa Switching Systems, Inc."  },
@@ -4095,7 +4095,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x13FA, "Radiantech, Inc."  },
     { 0x13FB, "Noritsu Koki Co., Ltd."  },
     { 0x13FC, "Compucat Research Pty Limited"  },
-    { 0x13FD, "Initio Corporation"  },
+    { 0x13FD, "Initio (HK) Corporation Limited"  },
     { 0x13FE, "Phison Electronics Corp."  },
     { 0x13FF, "VIEWCON ELECTRONIC LTD."  },
     { 0x1400, "Axxion Group Corp."  },
@@ -4321,7 +4321,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x14DE, "Jetway Information Co., Ltd."  },
     { 0x14DF, "COMPRION GmbH"  },
     { 0x14E0, "Winradio Communications"  },
-    { 0x14E1, "Dialogue Technology Corp."  },
+    { 0x14E1, "Imagination Broadway Ltd"  },
     { 0x14E2, "Avistar Communications Corporation"  },
     { 0x14E3, "Medmont Pty Ltd."  },
     { 0x14E4, "S.CAM Co., Ltd."  },
@@ -4456,7 +4456,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1565, "Advance Modules"  },
     { 0x1566, "WIN ACCORD LTD."  },
     { 0x1567, "MUTOH Industries Ltd."  },
-    { 0x1568, "Sunf Pu Technology Co., Ltd"  },
+    { 0x1568, "Sunf Pu Technology (Dong-Guan) Co., Ltd."  },
     { 0x1569, "Mad City Labs, Inc."  },
     { 0x156A, "Logical Solutions, Inc."  },
     { 0x156B, "Cairn Research Ltd."  },
@@ -4522,7 +4522,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x15A7, "APPSware Wireless LLC dba Apriva"  },
     { 0x15A8, "Shen Zhen Teamspower Electronics Co., Ltd."  },
     { 0x15A9, "Gemtek Technology Co., Ltd."  },
-    { 0x15AA, "DongGuan Ya Lian Electronics Co., Ltd."  },
+    { 0x15AA, "GuangDong Ya Lian Technology Co., Ltd"  },
     { 0x15AB, "Virgin HealthMiles, Inc."  },
     { 0x15AC, "Smartware"  },
     { 0x15AD, "Bleile Datentechnik GmbH"  },
@@ -4670,7 +4670,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x163B, "Controlled Speed Engineering Ltd."  },
     { 0x163C, "Watchdata System Co., Ltd."  },
     { 0x163D, "Million Tech Dev. Ltd."  },
-    { 0x163E, "HongLin Electronics Co., Ltd."  },
+    { 0x163E, "Dezhou HongJu Communication Technology Co., Ltd."  },
     { 0x163F, "AVEX Technologies, Inc."  },
     { 0x1640, "M3 Electronics, Inc."  },
     { 0x1641, "eMagin Corporation"  },
@@ -5527,7 +5527,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x199A, "DNA-Technology"  },
     { 0x199B, "MicroStrain, Inc."  },
     { 0x199C, "Richnex Microelectronics Corporation"  },
-    { 0x199D, "Dexxon Data Media"  },
+    { 0x199D, "Dexxon Groupe"  },
     { 0x199E, "The Imaging Source Europe GmbH"  },
     { 0x199F, "Benica Corporation"  },
     { 0x19A0, "Krautkramer Japan Co., Ltd."  },
@@ -5731,7 +5731,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1A67, "Privaris"  },
     { 0x1A68, "Double Top Technology Ltd."  },
     { 0x1A69, "Kalon Semiconductor, Inc."  },
-    { 0x1A6A, "Spansion Inc."  },
+    { 0x1A6A, "Cypress Semiconductor GmbH"  },
     { 0x1A6B, "Taiwin Electronics Co., Ltd."  },
     { 0x1A6C, "Hivion Co., Ltd."  },
     { 0x1A6D, "SamYoung Electronics Co., Ltd"  },
@@ -5746,7 +5746,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1A76, "JADAK Technologies, Inc."  },
     { 0x1A77, "American Master Import 26, Inc."  },
     { 0x1A78, "AirLink Communications, Inc."  },
-    { 0x1A79, "Bayer Health Care LLC"  },
+    { 0x1A79, "Ascensia Diabetes Care"  },
     { 0x1A7A, "Softron Co., Ltd."  },
     { 0x1A7B, "Lumberg Connect GmbH"  },
     { 0x1A7C, "Evoluent LLC"  },
@@ -5888,7 +5888,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1B04, "MEILHAUS Electronic GmbH"  },
     { 0x1B05, "Cracol Developments Ltd."  },
     { 0x1B06, "OPGAL"  },
-    { 0x1B07, "WEY Elektronik AG"  },
+    { 0x1B07, "WEY Technology AG"  },
     { 0x1B08, "Actimo Inc."  },
     { 0x1B09, "MISUZU INDUSTRIES CORPORATION"  },
     { 0x1B0A, "Sense Technology Inc."  },
@@ -6068,7 +6068,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1BB8, "MIZOUE PROJECT JAPAN Corporation"  },
     { 0x1BB9, "Qpixel Technology, Inc."  },
     { 0x1BBA, "Medicomp, Inc."  },
-    { 0x1BBB, "TCT Mobile Limited"  },
+    { 0x1BBB, "TCL Communication Ltd"  },
     { 0x1BBC, "KATHREIN-Werke KG"  },
     { 0x1BBD, "Videology Imaging Solutions, Inc."  },
     { 0x1BBE, "CE+T s.a."  },
@@ -6089,7 +6089,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1BCD, "AZKOYEN"  },
     { 0x1BCE, "Contac Cable Industrial Limited"  },
     { 0x1BCF, "Sunplus Innovation Technology Inc."  },
-    { 0x1BD0, "Hangzhou Riyue Electronic Co., Ltd."  },
+    { 0x1BD0, "Hangzhou Riyue Electronics Co., Ltd."  },
     { 0x1BD1, "Companion Worlds, Inc."  },
     { 0x1BD2, "Beijing G & D Card Systems Co., Ltd."  },
     { 0x1BD3, "3layer Engineering"  },
@@ -6098,7 +6098,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1BD6, "Lodam electronics"  },
     { 0x1BD7, "TouchNetworks, Inc."  },
     { 0x1BD8, "Image Computer Systems Limited"  },
-    { 0x1BD9, "Control Products, Inc."  },
+    { 0x1BD9, "Emerson"  },
     { 0x1BDA, "University of Southampton"  },
     { 0x1BDB, "Spectral Applied Research"  },
     { 0x1BDC, "Slacker"  },
@@ -6186,7 +6186,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1C2E, "LiveWire Test Labs, Inc."  },
     { 0x1C2F, "Wessex Advanced Switching Products Ltd."  },
     { 0x1C30, "Li Creative Technologies, Inc."  },
-    { 0x1C31, "LS Mtron"  },
+    { 0x1C31, "LS Mtron Ltd."  },
     { 0x1C32, "INTELBANQ"  },
     { 0x1C33, "EK-TEAM GmbH"  },
     { 0x1C34, "Pro-Active"  },
@@ -6665,7 +6665,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1E0D, "NEOWAVE"  },
     { 0x1E0E, "SHANGHAI BASECOM LTD."  },
     { 0x1E0F, "mSilica Inc."  },
-    { 0x1E10, "Point Grey Research Inc."  },
+    { 0x1E10, "FLIR Integrated Imaging Solutions"  },
     { 0x1E11, "Hoya Xponent"  },
     { 0x1E12, "OCTRIAN"  },
     { 0x1E13, "Burgundy Electric, LLC"  },
@@ -6900,7 +6900,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1EF8, "CRITICAL LINK, LLC"  },
     { 0x1EF9, "US Army Electronic Proving Ground"  },
     { 0x1EFA, "SEIKO Precision Inc."  },
-    { 0x1EFB, "TOUR & ANDERSSON AB"  },
+    { 0x1EFB, "IMI Hydronic Engineering International SA"  },
     { 0x1EFC, "IMOGEN STUDIO"  },
     { 0x1EFD, "ROFIN-SINAR LASER GMBH"  },
     { 0x1EFE, "Sound Design Technologies"  },
@@ -6931,7 +6931,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1F17, "APIS Device, Inc."  },
     { 0x1F18, "Teseq GmbH"  },
     { 0x1F19, "POLATIS INC."  },
-    { 0x1F1A, "SANDEN CORPORATION"  },
+    { 0x1F1A, "Sanden Retail Systems Corporation"  },
     { 0x1F1B, "NORTHROP GRUMMAN SPERRY MARINE"  },
     { 0x1F1C, "LXE, INC."  },
     { 0x1F1D, "How Weih Precision Technology (Shenzhen) Co., Ltd."  },
@@ -6990,7 +6990,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1F52, "Systems & Electronic Development FZCO (SEDCO)"  },
     { 0x1F53, "SK telesys"  },
     { 0x1F54, "LOEC, INC."  },
-    { 0x1F55, "Fujitsu Semiconductor Europe GmbH"  },
+    { 0x1F55, "Fujitsu Electronics Europe GmbH"  },
     { 0x1F56, "MUT"  },
     { 0x1F57, "PIGNOLO S.P.A."  },
     { 0x1F58, "Inmarsat"  },
@@ -7086,7 +7086,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x1FB2, "WITHINGS"  },
     { 0x1FB3, "Matchbeeper AB"  },
     { 0x1FB4, "Owl Computing Technologies, Inc."  },
-    { 0x1FB5, "Unify GmbH & Co. KG"  },
+    { 0x1FB5, "Unify Software and Solutions GmbH & Co. KG"  },
     { 0x1FB6, "SheKel"  },
     { 0x1FB7, "J & D Tech Co., Ltd."  },
     { 0x1FB8, "DORMA TIME + ACCESS GmbH"  },
@@ -7196,7 +7196,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2020, "Shanghai BroadMobi Communication Technology Co., Ltd."  },
     { 0x2021, "Smartd ltd"  },
     { 0x2022, "AMICON Ltd."  },
-    { 0x2023, "BERTHOLD DETECTION SYSTEMS GmbH"  },
+    { 0x2023, "Berthold Technologies GmbH & Co. KG"  },
     { 0x2024, "Shoto Technologies LLC"  },
     { 0x2025, "NANOSENSE"  },
     { 0x2026, "EASUN REYROLLE LIMITED"  },
@@ -7283,7 +7283,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2077, "Shenzhen Gongjin Electronics Co., Ltd."  },
     { 0x2078, "Epsilon Electronics, Inc dba Power Acoustik Electronics"  },
     { 0x2079, "New Concept Gaming Ltd."  },
-    { 0x207A, "CETWIN AB"  },
+    { 0x207A, "C.E.T.W.I.N System Solutions Sweden AB"  },
     { 0x207B, "Technetix Group Ltd."  },
     { 0x207C, "NESA International, Inc."  },
     { 0x207D, "CESI Technology Co., Ltd."  },
@@ -7311,7 +7311,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2093, "Ambu A/S"  },
     { 0x2094, "Yoostar Entertainment Group, Inc."  },
     { 0x2095, "CE LINK LIMITED"  },
-    { 0x2096, "Microconn Electronic Co., Ltd."  },
+    { 0x2096, "Shenzhen Microconn Investment and Development Co., Ltd."  },
     { 0x2097, "USBPARTNER"  },
     { 0x2098, "TouchTable, Inc."  },
     { 0x2099, "Systematic Development Group, LLC"  },
@@ -7421,7 +7421,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2101, "NAS Technologies Corp."  },
     { 0x2102, "Vitalograph Ltd."  },
     { 0x2103, "OHMORI ELECTRIC INDUSTRIES CO., LTD."  },
-    { 0x2104, "Tobii Technology AB"  },
+    { 0x2104, "Tobii AB"  },
     { 0x2105, "Retail Innovation HTT AB"  },
     { 0x2106, "Sharp Korea Corporation"  },
     { 0x2107, "Amstore CD Production Ltd."  },
@@ -7483,7 +7483,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x213F, "Digitron Instrumentation Ltd."  },
     { 0x2140, "Sichuan Jiuzhou Electric Group Co., Ltd."  },
     { 0x2141, "ZT Group Int'l, Inc."  },
-    { 0x2142, "Pulsecom"  },
+    { 0x2142, "Enginuity Communications"  },
     { 0x2143, "InDevR Inc."  },
     { 0x2144, "Sea Tel, Inc."  },
     { 0x2145, "Ballard Technology"  },
@@ -7535,7 +7535,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2173, "HUIZHOU HUANGJI PRECISIONS FLEX ELECTRONICAL CO., LTD."  },
     { 0x2174, "Transcend Information, Inc."  },
     { 0x2175, "Light Blue Optics, Inc."  },
-    { 0x2176, "TMC/Allion Test Labs"  },
+    { 0x2176, "TMC - Allion Test Labs"  },
     { 0x2177, "CHAUVIN ARNOUX"  },
     { 0x2178, "Ion Science"  },
     { 0x2179, "UGtizer Corp."  },
@@ -7553,7 +7553,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2185, "FUJIWORK Co., Ltd."  },
     { 0x2186, "Home Server Technologies Inc."  },
     { 0x2187, "ESPACE SERVICES MULTIMEDIAS"  },
-    { 0x2188, "CalDigit"  },
+    { 0x2188, "CalDigit, Inc."  },
     { 0x2189, "SEMNTECH"  },
     { 0x218A, "EXELYS LLC"  },
     { 0x218B, "Blackbird Technologies Inc."  },
@@ -7613,7 +7613,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x21C1, "Baumann Electronic Controls, LLC"  },
     { 0x21C2, "Shenzhen V-Interface Technology Co., Ltd."  },
     { 0x21C3, "MASIMO LABORATORIES INC."  },
-    { 0x21C4, "Netcom Technology (HK) Limited"  },
+    { 0x21C4, "Longsys Electronics (HK) Co., Ltd."  },
     { 0x21C5, "Vukic Computer Instruments GmbH"  },
     { 0x21C6, "PSS Hong Kong Limited"  },
     { 0x21C7, "Unisoku Co., Ltd."  },
@@ -7648,7 +7648,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x21E4, "Xcellen Co., Ltd."  },
     { 0x21E5, "Kruglov Evgeniy Vladimirovich"  },
     { 0x21E6, "OCZ Technology Group"  },
-    { 0x21E7, "Sagem Communications SAS"  },
+    { 0x21E7, "Sagemcom Broadband SAS"  },
     { 0x21E8, "BOEHNKE + PARTNER GmbH Steuerungssysteme"  },
     { 0x21E9, "Jiafuh Metal & Plastic (ShenZhen) Co., Ltd."  },
     { 0x21EA, "JUST MAKE ELECTRONICS CO., LTD."  },
@@ -7765,7 +7765,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2259, "Skypine Electronics (Shenzhen) Co., Ltd."  },
     { 0x225A, "Vivanco GmbH"  },
     { 0x225B, "Lineage Power"  },
-    { 0x225C, "Burroughs Payment Systems, Inc."  },
+    { 0x225C, "Digital Check Corp"  },
     { 0x225D, "Sagem Securite"  },
     { 0x225E, "Unholtz-Dickie Corp."  },
     { 0x225F, "Ace Karaoke Corp."  },
@@ -7873,7 +7873,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x22C5, "Himax Technologies, Inc."  },
     { 0x22C6, "Baker Hughes Production Quest"  },
     { 0x22C7, "MEMUP"  },
-    { 0x22C8, "Karming Electronic (Shenzhen) Co., Ltd."  },
+    { 0x22C8, "Shenzhen Xinerchang Electronics Co., Ltd."  },
     { 0x22C9, "StepOver GmbH"  },
     { 0x22CA, "Amimon Ltd."  },
     { 0x22CB, "Forware Spain S.L."  },
@@ -7977,7 +7977,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x232D, "Edinburgh Instruments Ltd."  },
     { 0x232E, "EA, Elektro-Automatik GmbH & Co. KG"  },
     { 0x232F, "Motic China Group Co., Ltd."  },
-    { 0x2330, "Tensorcom"  },
+    { 0x2330, "Tensorcom, Inc."  },
     { 0x2331, "PUZZLE LOGIC INC."  },
     { 0x2332, "Coges S.p.A."  },
     { 0x2333, "Zamzee Co."  },
@@ -8098,9 +8098,9 @@ VENDOR_ID USBVendorIDs[] =
     { 0x23A6, "Tronical Components GmbH"  },
     { 0x23A7, "System In Frontier Inc."  },
     { 0x23A8, "Sagio A/S"  },
-    { 0x23A9, "SiliconGo Microelectronics Co., Ltd."  },
+    { 0x23A9, "SiliconGo Microelectronics Inc."  },
     { 0x23AA, "DOK (HK) Trading Limited"  },
-    { 0x23AB, "Shenzhen Zhengtong Electronics Co., Ltd."  },
+    { 0x23AB, "SZZT ELECTRONICS CO., LTD"  },
     { 0x23AC, "Marunix Electron Limited"  },
     { 0x23AD, "voxeljet technology GmbH"  },
     { 0x23AE, "DIGITAL DEVICES UG"  },
@@ -8174,7 +8174,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x23F2, "Northern Digital Inc."  },
     { 0x23F3, "Funke Digital TV"  },
     { 0x23F4, "NXT Plc"  },
-    { 0x23F5, "Speed Conn Co., Ltd."  },
+    { 0x23F5, "Speed Conn Electronics (Shenzhen) Co., Ltd."  },
     { 0x23F6, "Gamesman Ltd."  },
     { 0x23F7, "TechRhythm, Inc."  },
     { 0x23F8, "Xiangde Electronic Technologies (Shenzhen) Co., Ltd."  },
@@ -8191,7 +8191,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2403, "XTRAMUS TECHNOLOGIES"  },
     { 0x2404, "GE MDS"  },
     { 0x2405, "Custom Computer Services, Inc."  },
-    { 0x2406, "INSIDE Secure"  },
+    { 0x2406, "WIseKey"  },
     { 0x2407, "Incasolution Co., Ltd."  },
     { 0x2408, "Catalyst Enterprises, Inc."  },
     { 0x2409, "BCInet, Inc."  },
@@ -8261,7 +8261,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2449, "SHAEFER GmbH"  },
     { 0x244A, "Onzo Ltd."  },
     { 0x244B, "Applied Technical Systems"  },
-    { 0x244C, "Minebea Co., Ltd."  },
+    { 0x244C, "MinebeaMitsumi Inc."  },
     { 0x244D, "Pantec Biosolutions AG"  },
     { 0x244E, "ShopGuard Ltd."  },
     { 0x244F, "iWall A/S"  },
@@ -8271,7 +8271,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2453, "BAANTO"  },
     { 0x2454, "Velosti Technology Limited"  },
     { 0x2455, "Anton/Bauer, Inc."  },
-    { 0x2456, "Nikki Denso Co., Ltd."  },
+    { 0x2456, "CKD NIKKI DENSO CO., LTD"  },
     { 0x2457, "Alcomp. Inc."  },
     { 0x2458, "Bluegiga Technologies Oy"  },
     { 0x2459, "Secure Holdings Limited"  },
@@ -8292,7 +8292,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2468, "New Cosmos Electric Co., Ltd."  },
     { 0x2469, "Gloria Music Corp."  },
     { 0x246A, "UNH Interoperability Laboratory"  },
-    { 0x246B, "Perfect Fortune Electric Wire & Cable (ShenZhen) Co Ltd"  },
+    { 0x246B, "Perfect Fortune Electric Wire & Cable (ShenZhen) Co. Ltd."  },
     { 0x246C, "Shanghai Fudan Microelectronics Co., Ltd."  },
     { 0x246D, "TrackMan A/S"  },
     { 0x246E, "Movinto Fun AB"  },
@@ -8306,7 +8306,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2476, "Yost Engineering Inc."  },
     { 0x2477, "UbiVelox"  },
     { 0x2478, "Sonix Technology (Shenzhen) Co., Ltd."  },
-    { 0x2479, "visiosens GmbH"  },
+    { 0x2479, "smartek d.o.o."  },
     { 0x247A, "Suzhou Jutze Technologies Co., Ltd"  },
     { 0x247B, "Digibras Industria do Brasil S.A"  },
     { 0x247C, "Fullconn Industry Inc."  },
@@ -8462,7 +8462,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2512, "RNDPLUS Co., Ltd."  },
     { 0x2513, "RMI Laser, LLC"  },
     { 0x2514, "Fullpower Technologies"  },
-    { 0x2515, "KOREA O/S TECHNOLOGIES"  },
+    { 0x2515, "AMITEK"  },
     { 0x2516, "Cooler Master Co., Ltd."  },
     { 0x2517, "Marel EHF"  },
     { 0x2518, "Anite Telecoms Inc."  },
@@ -8571,7 +8571,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x257F, "8devices"  },
     { 0x2580, "DJ Techtools (Golden Sol Music LLC. Is Holding Co.)"  },
     { 0x2581, "Plug-up"  },
-    { 0x2582, "Systeme Helmholz GmbH"  },
+    { 0x2582, "Helmholz GmbH & Co. KG"  },
     { 0x2583, "VECTRUX DISTRIBUTORS LLC"  },
     { 0x2584, "COSMO CO., LTD."  },
     { 0x2585, "HomeChip Ltd."  },
@@ -8739,7 +8739,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2627, "Vectron Systems AG"  },
     { 0x2628, "TEN-TEC, INC."  },
     { 0x2629, "Winstars Technology Limited"  },
-    { 0x262A, "SAVITECH Corporation"  },
+    { 0x262A, "SAVITECH CORP."  },
     { 0x262B, "YTOP Electronics Technical (Kunshan) Co., Ltd."  },
     { 0x262C, "Scannx"  },
     { 0x262D, "Fujian Witsi Microelectronics Technology Co., Ltd."  },
@@ -8770,7 +8770,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2646, "Bel Canto Design, Ltd."  },
     { 0x2647, "FORMER ENGINEERING SERVICE CO., LTD."  },
     { 0x2648, "Telongo LLC"  },
-    { 0x2649, "BYOS Audio, Inc."  },
+    { 0x2649, "Soundspring Audio, Inc"  },
     { 0x264A, "THERMALTAKE Technology Co., Ltd."  },
     { 0x264B, "Industrial Indexing Systems"  },
     { 0x264C, "Si14 SpA"  },
@@ -8968,7 +8968,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x270C, "Inhon Computer Co., Ltd."  },
     { 0x270D, "ROSAND Technologies"  },
     { 0x270E, "Applied Security Inc."  },
-    { 0x270F, "HGST, a Western Digital Company"  },
+    { 0x270F, "Western Digital, HGST"  },
     { 0x2710, "Kontron America, Inc."  },
     { 0x2711, "ASD Inc."  },
     { 0x2712, "US Army Benet Laboratories"  },
@@ -8976,7 +8976,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2714, "i'm S.p.A."  },
     { 0x2715, "Photron Limited"  },
     { 0x2716, "YUEN DA ELECTRONIC PRODUCTS FACTORY"  },
-    { 0x2717, "Beijing Xiaomi Communications Co., Ltd."  },
+    { 0x2717, "Xiaomi Communications Co., Ltd."  },
     { 0x2718, "Tamaggo"  },
     { 0x2719, "4iiii Innovations Inc."  },
     { 0x271A, "KONE Industrial Ltd."  },
@@ -8987,7 +8987,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x271F, "Shanghai Nufront Electronic Technology Co., Ltd."  },
     { 0x2720, "motrona GmbH"  },
     { 0x2721, "Germaneers GmbH"  },
-    { 0x2722, "FOOSUNG TECH"  },
+    { 0x2722, "TRANIT"  },
     { 0x2723, "KUK Electronic AG"  },
     { 0x2724, "XS Technology, Inc."  },
     { 0x2725, "L-3 Applied Signal & Image Technology"  },
@@ -9137,7 +9137,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x27B6, "TechnoKom Ltd."  },
     { 0x27B7, "Fraunhofer IMS"  },
     { 0x27B8, "ThingM Corporation"  },
-    { 0x27B9, "Azend Group Corp."  },
+    { 0x27B9, "Ziotech Corp"  },
     { 0x27BA, "Aoptix Technologies, Inc."  },
     { 0x27BB, "Plenom A/S"  },
     { 0x27BC, "KeyView"  },
@@ -9190,11 +9190,11 @@ VENDOR_ID USBVendorIDs[] =
     { 0x27EB, "ACCUCOMM, INC."  },
     { 0x27EC, "SEETECH CO., LTD."  },
     { 0x27ED, "Tescom-Emerson Process Management"  },
-    { 0x27EE, "Palmer Performance Engineering, Inc."  },
+    { 0x27EE, "DashLogic Inc."  },
     { 0x27EF, "TAIYO SEIKI CO., LTD."  },
     { 0x27F0, "DITECT Corporation"  },
     { 0x27F1, "VERTU Corporation Limited"  },
-    { 0x27F2, "Sibridge Tech."  },
+    { 0x27F2, "Softnautics Private Limited"  },
     { 0x27F3, "Indutherm Erwaermungsanlagen GmbH"  },
     { 0x27F4, "LEGIC Identsystems Ltd."  },
     { 0x27F5, "Relume Technologies, Inc."  },
@@ -9259,7 +9259,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2830, "GD-Broadband"  },
     { 0x2831, "Power Integrations"  },
     { 0x2832, "Applied Research Associates"  },
-    { 0x2833, "Oculus VR, Inc."  },
+    { 0x2833, "Oculus VR LLC"  },
     { 0x2834, "JM Concept"  },
     { 0x2835, "SEIDENSHA ELECTRONICS Co., Ltd."  },
     { 0x2836, "OUYA Inc."  },
@@ -9342,7 +9342,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2883, "abatec group AG"  },
     { 0x2884, "Bor"  },
     { 0x2885, "Quantec SA"  },
-    { 0x2886, "Seeed Technology Limited"  },
+    { 0x2886, "Seeed Technology Co., Ltd."  },
     { 0x2887, "Specwerkz"  },
     { 0x2888, "VEX Robotics, Inc."  },
     { 0x2889, "TrueVision Systems, Inc."  },
@@ -9425,7 +9425,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x28D6, "Electrogamez USA Inc."  },
     { 0x28D7, "Tekron International"  },
     { 0x28D8, "Panda Ocean Inc."  },
-    { 0x28D9, "Shenzhen Ourconn Technology Co., Ltd."  },
+    { 0x28D9, "Shenzhen Yoshuo Precision Components Co., Ltd."  },
     { 0x28DA, "G.SKILL Int'l Enterprice Co., Ltd."  },
     { 0x28DB, "Konftel AB"  },
     { 0x28DC, "Power Electronics International, Inc."  },
@@ -9442,7 +9442,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x28E7, "Glyph Production Technologies"  },
     { 0x28E8, "Jefferson Audio Video Systems, Inc."  },
     { 0x28E9, "GigaDevice Semiconductor (Beijing) Inc."  },
-    { 0x28EA, "Dongguan City Guangye Electronic Co., Ltd."  },
+    { 0x28EA, "Dongguan Vast Electronics Co.,Ltd"  },
     { 0x28EB, "SHEN ZHEN SHI YUAN AI HARDWARE ELECTRONIC CO., LTD."  },
     { 0x28EC, "Transcom Instruments Co., Ltd."  },
     { 0x28ED, "Shenzhen AraTek Biometrics Technology Co., Ltd."  },
@@ -9539,7 +9539,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2948, "Access Network Technology Limited"  },
     { 0x2949, "Shenzhen JSR Technology Co., Ltd."  },
     { 0x294A, "Shenzhen Xinguodu Technology Co., Ltd."  },
-    { 0x294B, "snakebyte asia Ltd."  },
+    { 0x294B, "snakebyte Asia Ltd."  },
     { 0x294C, "Terminus Circuits Pvt Ltd."  },
     { 0x294D, "Cellwise Holding Co., Ltd."  },
     { 0x294E, "SHIH HUA TECHNOLOGY LTD."  },
@@ -9563,7 +9563,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2960, "Power Probe, Inc."  },
     { 0x2961, "Miselu Inc."  },
     { 0x2962, "Wilocity Ltd."  },
-    { 0x2963, "FingerQ Macao Commercial Offshore Limited"  },
+    { 0x2963, "BIO-key International, Inc."  },
     { 0x2964, "Kintech Co., Ltd."  },
     { 0x2965, "Kortek"  },
     { 0x2966, "Schatz AG"  },
@@ -9601,7 +9601,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2986, "Rapt Touch (Ireland) Ltd."  },
     { 0x2987, "Lyve Minds, Inc."  },
     { 0x2988, "3D Systems Corporation"  },
-    { 0x2989, "Nanjing Fujitsu Computer Products Co., Ltd."  },
+    { 0x2989, "Nanjing Fujitsu Electronics Information Technology Co., Ltd"  },
     { 0x298A, "Singeen Electronics Technologies (Dongguan) Co., Ltd."  },
     { 0x298B, "Hanil ProTech"  },
     { 0x298C, "GL Solutions Inc."  },
@@ -9613,7 +9613,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2992, "Lantos Technologies, Inc."  },
     { 0x2993, "ADPlaus Technology Limited"  },
     { 0x2995, "Resodyn Corporation"  },
-    { 0x2996, "Unwired Technology"  },
+    { 0x2996, "Delphi Data Connectivity"  },
     { 0x2997, "Inogeni Inc."  },
     { 0x2998, "EOS S.r.l."  },
     { 0x2999, "Fourtec Technologies Ltd."  },
@@ -9759,7 +9759,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2A25, "Fourstar Group"  },
     { 0x2A26, "Tragant International Co., Ltd."  },
     { 0x2A27, "DongGuan LianGang Optoelectronic Technology Co., Ltd."  },
-    { 0x2A28, "The Hig, LLC"  },
+    { 0x2A28, "Higbie, LLC dba kinetuex"  },
     { 0x2A29, "PayPal, Inc."  },
     { 0x2A2A, "TARGAMITE LLC"  },
     { 0x2A2B, "NooElec Inc."  },
@@ -9804,7 +9804,6 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2A52, "L CARD Ltd."  },
     { 0x2A53, "x-odos GmbH"  },
     { 0x2A54, "Black Diamond Advanced Technology, LLC"  },
-    { 0x2A55, "Diodes Inc."  },
     { 0x2A56, "eemagine Medical Imaging Solutions GmbH"  },
     { 0x2A57, "Bellingham + Stanley Limited"  },
     { 0x2A58, "ALIGN Corporation Limited"  },
@@ -9813,7 +9812,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2A5B, "Integrity Applications Ltd."  },
     { 0x2A5C, "Dalian Zonewin Electronics Co., Ltd."  },
     { 0x2A5D, "Zhejiang Wanli Jo Ju Automation Technonolgy Co., Ltd."  },
-    { 0x2A5E, "DuPont"  },
+    { 0x2A5E, "The Chemours Company"  },
     { 0x2A5F, "Tencent Technology (Shenzhen) Company Limited"  },
     { 0x2A60, "Oscadi SAS"  },
     { 0x2A61, "Ellex Medical Pty Ltd."  },
@@ -9852,7 +9851,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2A82, "Printek, Inc."  },
     { 0x2A83, "Autodesk Inc."  },
     { 0x2A84, "ATE Systems"  },
-    { 0x2A85, "Hank Electronics Ltd."  },
+    { 0x2A85, "HANK ELECTRONICS CO., LTD"  },
     { 0x2A86, "KITRIS AG"  },
     { 0x2A87, "Kummler + Matter AG"  },
     { 0x2A88, "DFU Technology Ltd."  },
@@ -9882,7 +9881,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2AA0, "Casco Products Corp."  },
     { 0x2AA1, "Ivanhoe (DE), Inc."  },
     { 0x2AA2, "GTI Spindle Technology, Inc."  },
-    { 0x2AA3, "Altron"  },
+    { 0x2AA3, "Strike Technologies a Division of Penbro Kelnick (Pty) Ltd"  },
     { 0x2AA4, "Voim Technologies Inc."  },
     { 0x2AA5, "Pen Generations, Inc."  },
     { 0x2AA6, "ChengFong International Limited"  },
@@ -9949,7 +9948,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2AE3, "Jiuzhou Digital (Hong Kong) Limited"  },
     { 0x2AE4, "Next! s.c. Slawomir Piela, Bartlomiej Dryja"  },
     { 0x2AE5, "Fairphone B.V."  },
-    { 0x2AE6, "Enel Distribuzione"  },
+    { 0x2AE6, "e-distribuzione Spa"  },
     { 0x2AE7, "Advanced Media, Inc."  },
     { 0x2AE8, "Quintic Microelectronics (Wuxi) Co., Ltd."  },
     { 0x2AE9, "Regal Beloit Canada ULC. dba Thomson Power Systems"  },
@@ -10131,7 +10130,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2B99, "360fly, Inc."  },
     { 0x2B9A, "HUIZHOU CHENG SHUO HARDWARE PLASTIC CO., LTD."  },
     { 0x2B9B, "Zhongshan Aute Electronics Technology Co., Ltd."  },
-    { 0x2B9C, "Guangdong King Link Industry Co., Ltd."  },
+    { 0x2B9C, "Guangdong King Link Industrial Co., Ltd."  },
     { 0x2B9D, "HARTING Electric GmbH & Co. KG"  },
     { 0x2B9E, "ZPower LLC"  },
     { 0x2B9F, "Scietera Technologies, Inc."  },
@@ -10148,7 +10147,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2BAA, "New World Technologies Inc."  },
     { 0x2BAB, "Grandstream Networks, Inc."  },
     { 0x2BAC, "Polyera Corporation"  },
-    { 0x2BAD, "XIN JI (SHENZHEN) COMPUTER PARTS CO., LTD."  },
+    { 0x2BAD, "XinJi Technologies Ltd."  },
     { 0x2BAE, "Holinail H.K. Limited"  },
     { 0x2BAF, "Getac Technology Corp."  },
     { 0x2BB0, "ITES Co., Ltd."  },
@@ -10162,7 +10161,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2BB8, "OCC (Zhuhai) Electronic Co., Ltd."  },
     { 0x2BB9, "ARGUS-SPECTRUM"  },
     { 0x2BBA, "Sinseader Electronic Co., Ltd."  },
-    { 0x2BBB, "DONGGUAN YELLOWKNIFE Industrial Co., Ltd."  },
+    { 0x2BBB, "DONGGUAN YELLOW KNIFE Industrial Co., Ltd."  },
     { 0x2BBC, "Guided Ultrasonics Ltd"  },
     { 0x2BBD, "RF Creations Ltd."  },
     { 0x2BBE, "Chengyi Semiconductors (Shanghai) Co., Ltd."  },
@@ -10192,14 +10191,14 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2BD6, "CoroWare, Inc."  },
     { 0x2BD7, "EcuTek International Ltd."  },
     { 0x2BD8, "ROPEX Industrie-Elektronik GmbH"  },
-    { 0x2BD9, "Kubicam"  },
+    { 0x2BD9, "Huddly"  },
     { 0x2BDA, "Panono GmbH"  },
     { 0x2BDB, "LOVEOX CO., LTD."  },
     { 0x2BDC, "Automation Electronics Inc."  },
     { 0x2BDD, "Charm Sciences Inc."  },
     { 0x2BDE, "Pickering Interfaces Limited"  },
     { 0x2BDF, "Hangzhou Hikvision Digital Technology Co., Ltd."  },
-    { 0x2BE0, "FULLINK ELECTRONICS TECHNOLOGY (SZ) LTD"  },
+    { 0x2BE0, "Fullink Technology Co., Ltd"  },
     { 0x2BE1, "AutoChips Inc."  },
     { 0x2BE2, "Electric Connector Technology Co., Ltd."  },
     { 0x2BE3, "Hydac Electronic GmbH"  },
@@ -10271,7 +10270,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2C25, "Shanghai TAIDU INTELLIGENT TECHNOLOGY CO., LTD."  },
     { 0x2C26, "Micromax International Corporation"  },
     { 0x2C27, "YAWATA Electric Industrial Co., Ltd."  },
-    { 0x2C28, "XXCAL JAPAN Inc."  },
+    { 0x2C28, "Granite River Labs Japan Ltd."  },
     { 0x2C29, "Coagent Enterprise Limited"  },
     { 0x2C2A, "LEIA Inc."  },
     { 0x2C2B, "NetScout Systems, Inc."  },
@@ -10284,7 +10283,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2C32, "MCS Micronic Computer Systeme GmbH"  },
     { 0x2C33, "Shinobiya.com Co., Ltd."  },
     { 0x2C34, "Xerox Business Services (Switzerland) AG"  },
-    { 0x2C35, "Decto LLC"  },
+    { 0x2C35, "Decto, Inc."  },
     { 0x2C36, "Bonsai Lab, Inc."  },
     { 0x2C37, "Shenzhen Adition Audio Science & Technology Co., Ltd."  },
     { 0x2C38, "Goldenconn Electronics Technology (Suzhou) Co., Ltd."  },
@@ -10322,6 +10321,662 @@ VENDOR_ID USBVendorIDs[] =
     { 0x2C58, "Dyden Corporation"  },
     { 0x2C59, "EBARA CORPORATION"  },
     { 0x2C5A, "Mobilus Automotive Inc"  },
+    { 0x2C5B, "Shenglan Technology Co. Ltd"  },
+    { 0x2C5C, "Neusoft Corporation"  },
+    { 0x2C5D, "SIP Simya Electronics Technology Co., Ltd."  },
+    { 0x2C5E, "ELVES Automotive Co., Ltd"  },
+    { 0x2C5F, "YOODS Co., Ltd."  },
+    { 0x2C60, "Sirin LABS AG"  },
+    { 0x2C61, "Jadmam Corporation dba: Boytone"  },
+    { 0x2C62, "Trice Medical"  },
+    { 0x2C63, "Electronica Steren, S.A. de C.V."  },
+    { 0x2C64, "Creaform Inc. (Ametek Ultra Precision Technologies)"  },
+    { 0x2C65, "Nokia Technologies"  },
+    { 0x2C66, "EMOTIQ srl"  },
+    { 0x2C67, "VentureCraft, Ltd."  },
+    { 0x2C68, "EMRight Technology Co., Ltd."  },
+    { 0x2C69, "BBPOS Limited"  },
+    { 0x2C6A, "Joint Stock Company Research Centre Module"  },
+    { 0x2C6B, "System JD Co., Ltd"  },
+    { 0x2C6C, "Nano TouchSystems co., Ltd."  },
+    { 0x2C6D, "Gibson Innovations"  },
+    { 0x2C6E, "Shen Zhen Xian Shuo Technology Co. Ltd."  },
+    { 0x2C6F, "PST Eletronica LTDA"  },
+    { 0x2C70, "PERI, Inc."  },
+    { 0x2C71, "Bozhou BoTong Information Technology Co., Ltd."  },
+    { 0x2C72, "BlueberryE GmbH"  },
+    { 0x2C73, "Qiku Internet Network Scientific (Shenzhen) Co., Ltd."  },
+    { 0x2C74, "CJSC Nordavind"  },
+    { 0x2C75, "Net And Print Inc."  },
+    { 0x2C76, "DATAPATH LTD"  },
+    { 0x2C77, "Profindustry GmbH"  },
+    { 0x2C78, "BRAGI GmbH"  },
+    { 0x2C79, "WAWGD, Inc. (DBA: Foresight Sports)"  },
+    { 0x2C7A, "AutoNavi Software Co., Ltd."  },
+    { 0x2C7B, "Beijing ASU Tech Co., Ltd."  },
+    { 0x2C7C, "Anysmart Technologies Co., Ltd."  },
+    { 0x2C7D, "Shenzhen Protruly Electronic Co., Ltd."  },
+    { 0x2C7E, "Dongguan Allpass Electronic Co., Ltd."  },
+    { 0x2C7F, "SHENZHEN D-VITEC INDUSTRIAL CO., LTD."  },
+    { 0x2C80, "motomobile AG"  },
+    { 0x2C81, "Indie Semiconductor"  },
+    { 0x2C82, "Cloud9 Technologies LLC"  },
+    { 0x2C83, "LRP electronic GmbH"  },
+    { 0x2C84, "Innodezign MauRitius Limited"  },
+    { 0x2C85, "Audientes"  },
+    { 0x2C86, "Ultraflux"  },
+    { 0x2C87, "ISKN"  },
+    { 0x2C88, "K-Tronic SRL"  },
+    { 0x2C89, "Younes Medical Technologies"  },
+    { 0x2C8A, "Advanced Casino Electronics"  },
+    { 0x2C8B, "Huizhou Dehong Technology Co., Ltd."  },
+    { 0x2C8C, "PowerCenter Technology Limited"  },
+    { 0x2C8D, "Mizco International, Inc."  },
+    { 0x2C8E, "Unique Secure Limited"  },
+    { 0x2C8F, "Regulus Company Ltd."  },
+    { 0x2C90, "I. AM. PLUS, LLC"  },
+    { 0x2C91, "Corigine, Inc."  },
+    { 0x2C92, "Ningbo Yinzhou Shengke Electronics Co., Ltd."  },
+    { 0x2C93, "SWFL Inc. dba: Filament"  },
+    { 0x2C94, "HIRATSUKA Engineering Co., Ltd."  },
+    { 0x2C95, "TOSHIBA MACHINE CO., LTD."  },
+    { 0x2C96, "KBS Industrieelektronik GmbH"  },
+    { 0x2C97, "LEDGER"  },
+    { 0x2C98, "Fosfomatic Technology LLC"  },
+    { 0x2C99, "Prusa Research s.r.o."  },
+    { 0x2C9A, "Lawo AG"  },
+    { 0x2C9B, "SPECIM, Spectral Imaging Ltd."  },
+    { 0x2C9C, "Vayyar Imaging LTD."  },
+    { 0x2C9D, "Nod Inc."  },
+    { 0x2C9E, "Shanghai Linguo Technology Co.,Ltd."  },
+    { 0x2C9F, "e-Smart Systems Pvt. Ltd."  },
+    { 0x2CA0, "Leagtech Jiangxi Electronic Co., Ltd."  },
+    { 0x2CA1, "Veetone Technologies Limited"  },
+    { 0x2CA2, "GuangZhou MingPing Electronics Technology"  },
+    { 0x2CA3, "DJI Technology Co., Ltd."  },
+    { 0x2CA4, "Shenzhen Alex Technology Co., Ltd."  },
+    { 0x2CA5, "Fussen Technology Co., Ltd."  },
+    { 0x2CA6, "Dai-ichi Dentsu Ltd."  },
+    { 0x2CA7, "Heptagon Advanced Micro Optics"  },
+    { 0x2CA8, "STATSports"  },
+    { 0x2CA9, "JITS TECHNOLOGY CO., LIMITED"  },
+    { 0x2CAA, "LIVV Brand llc"  },
+    { 0x2CAB, "AppWorld S. de R.L. de C.V."  },
+    { 0x2CAC, "MGF Sviesos Konversija, UAB"  },
+    { 0x2CAD, "EMS Security Group Ltd."  },
+    { 0x2CAE, "Clyde Broadcast Products Ltd."  },
+    { 0x2CAF, "IDS GmbH"  },
+    { 0x2CB0, "Creative bits Solutions"  },
+    { 0x2CB1, "Avista Corporation"  },
+    { 0x2CB2, "NAGANO KEIKI CO., LTD."  },
+    { 0x2CB3, "Shenzhen Bolin Image Science Technology Co., Ltd."  },
+    { 0x2CB4, "Ava Enterprises, Inc. dba Boss Audio Systems"  },
+    { 0x2CB5, "SUS Corp."  },
+    { 0x2CB6, "Borqs Hong Kong Limited"  },
+    { 0x2CB7, "Fibocom Wireless Inc."  },
+    { 0x2CB8, "Shenzhen Sydixon Electronic Technology Co., Ltd."  },
+    { 0x2CB9, "On-Bright Electronics (Shanghai) Co., Ltd."  },
+    { 0x2CBA, "Dongguan Puxu Industrial Co., Ltd."  },
+    { 0x2CBB, "Shenzhen Soling Indusrtial Co., Ltd."  },
+    { 0x2CBD, "EGGCYTE, INC."  },
+    { 0x2CBE, "uQontrol"  },
+    { 0x2CBF, "Donggguan Yuhua Electronic Co., Ltd."  },
+    { 0x2CC0, "Hangzhou Zero Zero Technology Co., Ltd."  },
+    { 0x2CC1, "SIGFOX"  },
+    { 0x2CC2, "Lautsprecher Teufel GmbH"  },
+    { 0x2CC3, "A-VEKT K.K."  },
+    { 0x2CC4, "Sanden Advanced Technology Corporation"  },
+    { 0x2CC5, "Metatronics"  },
+    { 0x2CC6, "Prodigy Technovations Pvt Ltd"  },
+    { 0x2CC7, "EmergiTech, Inc"  },
+    { 0x2CC8, "Hewlett Packard Enterprise"  },
+    { 0x2CC9, "Monolithic Power Systems Inc."  },
+    { 0x2CCA, "Amphenol Advanced Sensors"  },
+    { 0x2CCB, "USB Memory Direct"  },
+    { 0x2CCC, "Silicon Mitus Inc."  },
+    { 0x2CCD, "ITOS Inc."  },
+    { 0x2CCE, "SMARTY Performance King SA"  },
+    { 0x2CCF, "Hypersecu Information Systems, Inc."  },
+    { 0x2CD0, "Technics Global Electronics & JCE Co., Ltd."  },
+    { 0x2CD1, "Tamron Co., Ltd."  },
+    { 0x2CD2, "Mikrotikls S/A"  },
+    { 0x2CD3, "Life Robotics Inc."  },
+    { 0x2CD4, "NGK SPARK PLUG CO., LTD."  },
+    { 0x2CD5, "Institut Dr. Foerster GmbH & Co. KG"  },
+    { 0x2CD6, "Immersive Media"  },
+    { 0x2CD7, "Cosemi Technologies Inc."  },
+    { 0x2CD8, "Nanoport Technology, Inc."  },
+    { 0x2CD9, "Cambrionix Ltd"  },
+    { 0x2CDA, "CXUN Co. Ltd."  },
+    { 0x2CDB, "China Tsp Inc"  },
+    { 0x2CDC, "Sea & Sun Technology GmbH"  },
+    { 0x2CDD, "IAI Corporation"  },
+    { 0x2CDE, "RTI International"  },
+    { 0x2CDF, "Tecno Alarm S.R.L."  },
+    { 0x2CE0, "iClassmate Educational Technologies Co., Ltd."  },
+    { 0x2CE1, "Gradus Group"  },
+    { 0x2CE2, "Yanfeng Visteon (Chongqing) Automotive Electronics Co"  },
+    { 0x2CE3, "Alcorlink Corp."  },
+    { 0x2CE4, "ISBC Ltd."  },
+    { 0x2CE5, "InX8 Inc dba AKiTiO"  },
+    { 0x2CE6, "SDAN Tecchnology Co., Ltd."  },
+    { 0x2CE7, "Lemobile Information Technology (Beijing) Co., Ltd."  },
+    { 0x2CE8, "DongGuan Hongweixiang Electronic Technology Co., Ltd."  },
+    { 0x2CE9, "Suzhu Jingshi Electronic Technology Co., Ltd."  },
+    { 0x2CEA, "Zhong Shan City Richsound Electronic Industrial Ltd."  },
+    { 0x2CEB, "Dongguang Kangbang Electronics Co., Ltd."  },
+    { 0x2CEC, "Ascon Tecnologic"  },
+    { 0x2CED, "KMC Controls, Inc."  },
+    { 0x2CEE, "Winpower Qmadix Technology Co., Ltd."  },
+    { 0x2CEF, "Toptest Technologies Co., Ltd."  },
+    { 0x2CF0, "Nuand, LLC"  },
+    { 0x2CF1, "DTS, Inc."  },
+    { 0x2CF2, "KUNSHAN DLK Electronics Technology Co., Ltd."  },
+    { 0x2CF3, "Konekt, Inc."  },
+    { 0x2CF4, "CAM2 Technologies, LLC dba: Czitek"  },
+    { 0x2CF5, "EBARA REFRIGERATION EQUIPMENT & SYSTEMS CO., LTD."  },
+    { 0x2CF6, "Eye-Fi, Inc."  },
+    { 0x2CF7, "PPST, Inc."  },
+    { 0x2CF8, "Itron"  },
+    { 0x2CF9, "Terrafix Ltd."  },
+    { 0x2CFA, "Meta Company"  },
+    { 0x2CFB, "Nanchang Haozhun Electronics Co., Ltd."  },
+    { 0x2CFC, "DeLaval International AB"  },
+    { 0x2CFD, "GoerTek Inc."  },
+    { 0x2CFE, "Alpha Data Parallel Systems"  },
+    { 0x2CFF, "ITHAKi"  },
+    { 0x2D00, "VDO Cyclecomputing, Cycle Parts GmbH"  },
+    { 0x2D01, "Gopod Group Limited"  },
+    { 0x2D02, "Zhi Sheng Electronics Technology Co., Ltd."  },
+    { 0x2D03, "ECCO Safety Group"  },
+    { 0x2D05, "Technology Solutions (UK) Limited"  },
+    { 0x2D06, "Jireh Industries Ltd."  },
+    { 0x2D07, "MSI.TOKYO, Inc."  },
+    { 0x2D08, "ZIT Ltd."  },
+    { 0x2D09, "Dongguan Evervictory Electronic Co., Ltd."  },
+    { 0x2D0A, "Kingsignal Technology Co., Ltd."  },
+    { 0x2D0B, "IPD CO., LTD"  },
+    { 0x2D0C, "B & P Automation Dynamics Ltd"  },
+    { 0x2D0D, "Star Vision Electronics Limited"  },
+    { 0x2D0E, "Linxee (Beijing) Technology LTD."  },
+    { 0x2D0F, "M8TRIX TECH LLC"  },
+    { 0x2D10, "Shenzhen San Guan Si Yuan Technology Limited"  },
+    { 0x2D11, "Servelec Technologies"  },
+    { 0x2D12, "SICPA Security Solutions SA"  },
+    { 0x2D13, "DONG GUAN EBEN ELECTRONIC CO., LTD"  },
+    { 0x2D14, "Palit Microsystems Ltd"  },
+    { 0x2D15, "Si-Ware Systems"  },
+    { 0x2D16, "DONGGUAN WELLINK ELECTRONIC CO., LTD."  },
+    { 0x2D17, "TECHVIWIN INTERNATIONAL (HONGKONG) LIMITED"  },
+    { 0x2D18, "Hui Zhou Kai Yue Electronics Co., Ltd"  },
+    { 0x2D19, "Churchill Navigation"  },
+    { 0x2D1A, "Phononic"  },
+    { 0x2D1B, "Suzhou Yourfriend Electronic Co., Ltd."  },
+    { 0x2D1C, "Club 3D BV"  },
+    { 0x2D1D, "Design Pool Limited"  },
+    { 0x2D1E, "Excalibur"  },
+    { 0x2D1F, "Wacom Taiwan Information Co. Ltd."  },
+    { 0x2D20, "UL LLC"  },
+    { 0x2D21, "Koozyt, Inc."  },
+    { 0x2D22, "SEIKOSHA Co., Ltd."  },
+    { 0x2D23, "Shenzhen Microtest Automation Co., Ltd."  },
+    { 0x2D24, "Warwick Audio Technologies Ltd"  },
+    { 0x2D25, "Kronegger GmbH"  },
+    { 0x2D26, "Greenfield Technology"  },
+    { 0x2D27, "Global Optics Limited"  },
+    { 0x2D28, "Beijing ANTVR Technology Co., LTD"  },
+    { 0x2D29, "Beijing Baofengmojing Technologies Co. Ltd"  },
+    { 0x2D2A, "Shenzhen ZDT Technology Co., LTD"  },
+    { 0x2D2B, "STYL Solutions Pte Ltd"  },
+    { 0x2D2C, "Tankya Developing Co., Limited"  },
+    { 0x2D2D, "Guangzhou Botao Information Technology Co., Ltd"  },
+    { 0x2D2E, "Hieyoung International (Hong Kong) Limited"  },
+    { 0x2D2F, "PT Phototechnics AG"  },
+    { 0x2D30, "Addasound Denmark A/S"  },
+    { 0x2D31, "Synox Tech Co., Ltd."  },
+    { 0x2D32, "JR Technik Co., Ltd."  },
+    { 0x2D33, "Elysia-raytest GmbH"  },
+    { 0x2D34, "Nureva Inc."  },
+    { 0x2D35, "SIGMA TECH. CO., LTD"  },
+    { 0x2D36, "Blu5 View Pte. Ltd."  },
+    { 0x2D37, "Xprinter Co., Ltd"  },
+    { 0x2D38, "Shanghai OXi Technology Co., Ltd"  },
+    { 0x2D39, "Roofer Technology (Shenzhen) Co. Ltd"  },
+    { 0x2D3A, "Le Touch (Shenzhen) Electronics Co., Ltd."  },
+    { 0x2D3B, "Lencheng Electronics Co., Ltd"  },
+    { 0x2D3C, "FOVE, Inc."  },
+    { 0x2D3D, "Battlespace Simulations, Inc."  },
+    { 0x2D3E, "Technica Del Arte BV"  },
+    { 0x2D3F, "ViCentra B.V."  },
+    { 0x2D40, "Beijing Pico Technology Co., Ltd."  },
+    { 0x2D41, "Dongguan Mankind Plastic Electronics Co., Ltd"  },
+    { 0x2D42, "Protech Electronics & Technology Limited"  },
+    { 0x2D43, "OSSIC Corporation"  },
+    { 0x2D44, "FAMAR FUEGUINA S.A."  },
+    { 0x2D45, "JSC TION SMART MICROCLIMATE"  },
+    { 0x2D46, "JSC Yukon Advanced Optics Worldwide"  },
+    { 0x2D47, "INVENCO GROUP LIMITED"  },
+    { 0x2D48, "StarBridge, Inc."  },
+    { 0x2D49, "Shanghai Deepoon Technology Co., Ltd."  },
+    { 0x2D4A, "Helioway Enterprises Co., Ltd"  },
+    { 0x2D4B, "Dongguan Hongwei Electronics Co.,Ltd"  },
+    { 0x2D4C, "Ixtra Tech Inc"  },
+    { 0x2D4D, "Razer Inc"  },
+    { 0x2D4E, "Electronic Equipment BV"  },
+    { 0x2D4F, "Dongguan Hanker Electronic Technology Co., Ltd."  },
+    { 0x2D50, "CryLaS - Crystal Laser Systems GmbH"  },
+    { 0x2D51, "NITTA Corporation"  },
+    { 0x2D52, "YiQin Electronics Co.,Ltd"  },
+    { 0x2D53, "OWOW Products B.V."  },
+    { 0x2D54, "C-Smartlink Information Technology Co., Ltd."  },
+    { 0x2D55, "Nagravision SA"  },
+    { 0x2D56, "DongGuan Kelta Electro Mechanical Products CO, LTD"  },
+    { 0x2D58, "Lyra Semiconductor Incorporated"  },
+    { 0x2D59, "Sunyking Technology Co., Ltd"  },
+    { 0x2D5A, "Shenzhen YAAN Precision Connector Co., Ltd."  },
+    { 0x2D5B, "SunTo Technology (Shen Zhen) Corporation Limited"  },
+    { 0x2D5C, "Daiwoo Electronics Lo., LTD"  },
+    { 0x2D5D, "Loctek Ergonomic Technology Corp."  },
+    { 0x2D5E, "Sky UK Limited"  },
+    { 0x2D5F, "Shanghai Yuewen information technology Co., Ltd."  },
+    { 0x2D60, "Comarch S.A."  },
+    { 0x2D61, "Shenzhen Hongjixin Plastic & Electronics Co., Ltd"  },
+    { 0x2D62, "Weifang Genius Electronics Co.,Ltd."  },
+    { 0x2D63, "Cable Technology Corp."  },
+    { 0x2D64, "H.D.T. S.R.L"  },
+    { 0x2D65, "DPA Microphones"  },
+    { 0x2D66, "Oley Company Limited"  },
+    { 0x2D67, "Fengfan (Suzhou) Audio Technology Co., Ltd."  },
+    { 0x2D68, "Lumulabs d.o.o."  },
+    { 0x2D6A, "AIPHONE Co., LTD"  },
+    { 0x2D6B, "NetUP Inc."  },
+    { 0x2D6C, "Sphericam Inc."  },
+    { 0x2D6D, "Shenzhen HaiWei Technology Co., LTD"  },
+    { 0x2D6E, "Jiangsu Jing Lian Electronic Technology Co., Ltd"  },
+    { 0x2D6F, "Tobii Dynavox"  },
+    { 0x2D70, "Zhongshan Winner Electronic Technology CO., LTD"  },
+    { 0x2D71, "OVERKIZ"  },
+    { 0x2D72, "DOGAWIST - Investment GmbH"  },
+    { 0x2D73, "XtremeMac Sarl"  },
+    { 0x2D74, "CMO America; dba ZipKord Solutions"  },
+    { 0x2D75, "Shenzhen Taiji Electronics Co., Ltd."  },
+    { 0x2D76, "SiliConch Systems Private Limited"  },
+    { 0x2D77, "SweDeltaco AB"  },
+    { 0x2D78, "Dental Imaging Technology Corporation"  },
+    { 0x2D79, "Shenzhen Legendary Technologies Co., LTD."  },
+    { 0x2D7A, "Dongguan JingFeng Electronics Technology Co., Ltd"  },
+    { 0x2D7B, "Panasonic Lighting Americas, Inc."  },
+    { 0x2D7C, "Dongguan City Qingda Electronic Co., Ltd."  },
+    { 0x2D7D, "Televes S.A."  },
+    { 0x2D7E, "NISSIN ELECTRIC Corporation"  },
+    { 0x2D7F, "Sinar Photography AG"  },
+    { 0x2D80, "Pendo Technology China Corporation"  },
+    { 0x2D81, "Evollve Inc."  },
+    { 0x2D82, "boud"  },
+    { 0x2D84, "Zhuhai J-Speed Technology Co., Ltd."  },
+    { 0x2D85, "Asahi Electronics Laboratory"  },
+    { 0x2D86, "Dongguan Team Force Electronic Co., Ltd"  },
+    { 0x2D87, "Zhuhai Spark Electronic Equipment Co., Ltd"  },
+    { 0x2D88, "Prinics Co., Ltd."  },
+    { 0x2D89, "Ekahau"  },
+    { 0x2D8A, "I-O Conn (GuangDong) Technologies Co., Ltd"  },
+    { 0x2D8B, "Eclatkey Semiconductor Technology Company Limited"  },
+    { 0x2D8C, "Hongrida Electronic Technology Co. LTD"  },
+    { 0x2D8D, "MISUMI Corporation"  },
+    { 0x2D8E, "Color Sentinel Systems, LLC"  },
+    { 0x2D8F, "Shenzhen Bing Chuang Wei Technology Co., Ltd."  },
+    { 0x2D90, "Humanplus"  },
+    { 0x2D91, "SDI Technologies Inc."  },
+    { 0x2D92, "Shanghai Fengtian Electronic Co., LTD."  },
+    { 0x2D93, "STK TECHNOLOGY CO., LTD."  },
+    { 0x2D94, "TokenWorks Inc."  },
+    { 0x2D95, "Vivo Mobile Communication Co., Ltd."  },
+    { 0x2D96, "SHENZHEN WAMAXLINK ELECTRONIC TECHNOLOGY CO., LTD"  },
+    { 0x2D97, "Dong Guan JingHe Electronics Technology Co., Ltd"  },
+    { 0x2D98, "Shenzhen Ruiming Technology Co., Ltd."  },
+    { 0x2D99, "Edifier International Limited"  },
+    { 0x2D9A, "Jiangsu GuoGuang Electronic Information Technology Co.,"  },
+    { 0x2D9B, "iStorage Limited"  },
+    { 0x2D9C, "Global Connector Technology"  },
+    { 0x2D9D, "Dongguan Suntes Electronics Technology Co., Ltd."  },
+    { 0x2D9E, "Sivantos GmbH"  },
+    { 0x2D9F, "SABRENT"  },
+    { 0x2DA0, "IN-VISION Digital Imaging Optics GmbH"  },
+    { 0x2DA1, "Koden Electronics Co., Ltd"  },
+    { 0x2DA2, "CIMA SPA con socio unico"  },
+    { 0x2DA3, "Superior Communications"  },
+    { 0x2DA4, "GE Multilin"  },
+    { 0x2DA5, "Tokai Rika Create Corporation"  },
+    { 0x2DA6, "SiChuan Rui Thai Electronic Technology Co., Ltd."  },
+    { 0x2DA7, "Topland Corporation"  },
+    { 0x2DA8, "Harmonic Drive Systems Inc."  },
+    { 0x2DA9, "ELECTRONIC ASSEMBLY GmbH"  },
+    { 0x2DAA, "Shenzhen Jing Tuo Jin Electronics Co., Ltd."  },
+    { 0x2DAB, "CYD Electronics (Shenzhen) Co., Ltd."  },
+    { 0x2DAC, "Shenzhen YZB Electronics Technology Co., Ltd"  },
+    { 0x2DAD, "GoerTek Dynaudio Co., Ltd"  },
+    { 0x2DAE, "Hex Technology Limited"  },
+    { 0x2DAF, "IF Link Electronics Co Limited"  },
+    { 0x2DB0, "Shenzhen Welltech Cable Co., Ltd"  },
+    { 0x2DB1, "DongGuan Greatek Electronics Technology Co., LTD"  },
+    { 0x2DB2, "Imperx, Inc"  },
+    { 0x2DB3, "i Digital Galaxy Ltd."  },
+    { 0x2DB4, "Dongguan Changtuo Hardware Technology Co., Ltd."  },
+    { 0x2DB5, "Fuji Ceramics Corporation"  },
+    { 0x2DB6, "Kunshan 3e Electronics Co., Ltd."  },
+    { 0x2DB7, "Premium Sound Solutions Sdn. Bhd."  },
+    { 0x2DB8, "Foshan Yami Electric Ltd."  },
+    { 0x2DB9, "Danelec Marine A/S"  },
+    { 0x2DBA, "Houwa System Design, k.k"  },
+    { 0x2DBB, "Huajie IMI Technology Co., Ltd."  },
+    { 0x2DBC, "Mikroelektronika d.o.o"  },
+    { 0x2DBD, "Shanghai Xiaoyi Technology Co., Ltd"  },
+    { 0x2DBE, "MA Lighting Technology GmbH"  },
+    { 0x2DBF, "Tul Corporation"  },
+    { 0x2DC0, "Chipsea Technologies (Shenzhen) Corp"  },
+    { 0x2DC1, "littleBits"  },
+    { 0x2DC2, "MintWave Co., Ltd."  },
+    { 0x2DC3, "Action Industries (M) SDN BHD"  },
+    { 0x2DC4, "Six 15 Technologies"  },
+    { 0x2DC5, "Cytek Biosciences, Inc."  },
+    { 0x2DC6, "Dongguan Kingtron Electronics Technology Co., Ltd."  },
+    { 0x2DC7, "Lacroix Sofrel"  },
+    { 0x2DC8, "8BITDO TECHNOLOGY HK LIMITED"  },
+    { 0x2DC9, "3T B.V."  },
+    { 0x2DCA, "OEM Systems Co., Ltd."  },
+    { 0x2DCB, "i-Money Technology Co., Ltd."  },
+    { 0x2DCC, "Suzhou Keda Technology Co., Ltd."  },
+    { 0x2DCD, "Yeonho Electronics"  },
+    { 0x2DCE, "Shen Zhen Farmer Technology Co., Limited"  },
+    { 0x2DCF, "Dialog Semiconductor (UK) Ltd"  },
+    { 0x2DD0, "iBaby Labs, Inc"  },
+    { 0x2DD1, "Empathy Co., Ltd."  },
+    { 0x2DD2, "HARNICS Co., LTD."  },
+    { 0x2DD3, "Viscell, LLC"  },
+    { 0x2DD5, "Gingy Technology Inc."  },
+    { 0x2DD6, "Suzhou SuperMax Smart System Co., Ltd."  },
+    { 0x2DD7, "enRoute Co., Ltd."  },
+    { 0x2DD8, "Perception Sensors and Instrumentation Ltd"  },
+    { 0x2DD9, "Dong Guan Fei Tai Electronics CO., LTD."  },
+    { 0x2DDA, "Miura Systems Ltd"  },
+    { 0x2DDB, "Shenzhen DAK Technology Co., Ltd"  },
+    { 0x2DDC, "Audiolink Co., Ltd"  },
+    { 0x2DDD, "Princeton Infrared Technologies, Inc."  },
+    { 0x2DDE, "The Chamberlain Group, Inc."  },
+    { 0x2DDF, "BOMTECH ELECTRONICS CO., LTD."  },
+    { 0x2DE0, "Active-semi, Inc"  },
+    { 0x2DE1, "Jiang Su Denseting Precision Technology Co., Ltd."  },
+    { 0x2DE2, "PathPartner Technology Pvt. Ltd"  },
+    { 0x2DE3, "Shanghai Yitu Technology Co., Ltd."  },
+    { 0x2DE4, "Best Case and Accessories, Inc."  },
+    { 0x2DE5, "KaiJet Technology International Limited, Inc. dba j5create"  },
+    { 0x2DE6, "Amazon Fulfillment Services, Inc."  },
+    { 0x2DE7, "The LightCo, Inc."  },
+    { 0x2DE8, "Shenzhen City Xiaoduan Electrical Co., LTD."  },
+    { 0x2DE9, "CAR MATE MFG. CO., LTD."  },
+    { 0x2DEA, "LightFactor"  },
+    { 0x2DEB, "Hold-Key Electric Wire & Cable Co Ltd"  },
+    { 0x2DEC, "ZNi Technology Co., Ltd"  },
+    { 0x2DED, "Aquil Star Precision Industrial (Shenzhen) Co., Ltd"  },
+    { 0x2DEE, "Shenzhen MeiG Smart Technology Co., Ltd"  },
+    { 0x2DEF, "Kirale Technologies SL"  },
+    { 0x2DF0, "CANVASBIO CO., LTD"  },
+    { 0x2DF1, "Inovonics Corp"  },
+    { 0x2DF2, "LIPS Corporation"  },
+    { 0x2DF3, "LongSung Technology (Shanghai) Co., Ltd."  },
+    { 0x2DF4, "Jumplux Technology Co., Ltd."  },
+    { 0x2DF5, "Helium Systems Inc."  },
+    { 0x2DF6, "Greektown Casino-Hotel, LLC"  },
+    { 0x2DF7, "Fastwel Group Ltd."  },
+    { 0x2DF8, "ITEST"  },
+    { 0x2DF9, "EZQuest, Inc."  },
+    { 0x2DFA, "3DRUDDER"  },
+    { 0x2DFB, "Bren-Tronics, Inc."  },
+    { 0x2DFC, "Graphic Products"  },
+    { 0x2DFD, "Ubisoft Entertainment SA"  },
+    { 0x2DFE, "Next Thing Co."  },
+    { 0x2DFF, "Unicept GmbH"  },
+    { 0x2E00, "CIB Security Inc"  },
+    { 0x2E01, "Symetrix, Inc."  },
+    { 0x2E02, "Softiron"  },
+    { 0x2E03, "Zhejiang Dahua Technology Co., Ltd."  },
+    { 0x2E04, "HMD Global Oy"  },
+    { 0x2E05, "CKD Corporation"  },
+    { 0x2E06, "Shenzhen Junlan Electronic Ltd"  },
+    { 0x2E07, "Lafayette Instrument Company"  },
+    { 0x2E08, "Zhongshan Dumei Weite Electronics Co., Ltd"  },
+    { 0x2E09, "Beijing LLVision Technology Co. LTD"  },
+    { 0x2E0A, "Dytran Instruments"  },
+    { 0x2E0B, "Datafield Industries (HK) Ltd"  },
+    { 0x2E0C, "Shenzhen Mek Intellisys PTE Ltd"  },
+    { 0x2E0D, "Suzhou FanglinTechnology Co., Ltd"  },
+    { 0x2E0E, "Hatteland Display AS"  },
+    { 0x2E0F, "Institute for Defense Analyses / Center for Computing Sciences"  },
+    { 0x2E10, "LinkMTech Inc."  },
+    { 0x2E11, "ShenZhen ShenTai WeiXiang Electronics Co., Ltd"  },
+    { 0x2E12, "Hongkong Chenyang Electronic Co., Limited"  },
+    { 0x2E13, "Intelligent Automation (Zhuhai) Co., Ltd"  },
+    { 0x2E14, "Expressive"  },
+    { 0x2E15, "Now Technologies"  },
+    { 0x2E16, "Glosys Inc."  },
+    { 0x2E17, "Essential Products, Inc."  },
+    { 0x2E18, "NorthStar Battery Company, LLC"  },
+    { 0x2E19, "Additel Corporation"  },
+    { 0x2E1A, "Shenzhen Arashi Vision Company Limited"  },
+    { 0x2E1B, "BeiJie Electronics Technology Co., Ltd"  },
+    { 0x2E1C, "Shenzhen Auto-Link World Information Technology Co., Ltd."  },
+    { 0x2E1D, "Clarion (Malaysia) Sdn. Bhd."  },
+    { 0x2E1E, "Sound Technology (C.Q.) Co., Ltd"  },
+    { 0x2E1F, "BrainScope Company, Inc."  },
+    { 0x2E20, "Guangzhou Long Do Co.,Ltd"  },
+    { 0x2E21, "DOSCH&AMAND Research GmbH&CoKG"  },
+    { 0x2E22, "DongGuan LinSong precision electronics CO., LTD"  },
+    { 0x2E23, "Shenzhen Baojia Battery Technology Co., Ltd."  },
+    { 0x2E24, "Hyperkin Inc."  },
+    { 0x2E25, "Gold Cable (Zhongshan) Electronic Co., Ltd."  },
+    { 0x2E26, "Monoprice, Inc."  },
+    { 0x2E27, "Lion Semiconductor"  },
+    { 0x2E28, "VOLTRONIC POWER TECHNOLOGY CORP."  },
+    { 0x2E29, "Clas Ohlson AB"  },
+    { 0x2E2B, "Shenzhen Qinps Technology Co Limited"  },
+    { 0x2E2C, "Dashine Electronics Co, Ltd"  },
+    { 0x2E2D, "Anaren Inc."  },
+    { 0x2E2E, "First Design System Inc."  },
+    { 0x2E2F, "Gulden Ophthalmics, Inc."  },
+    { 0x2E30, "Andon Health Co., Ltd."  },
+    { 0x2E31, "Thine Electronics, Inc."  },
+    { 0x2E32, "Shenzhen Red Star Electronics Co., Ltd."  },
+    { 0x2E33, "Squarehead Technology"  },
+    { 0x2E34, "ALLDATA LLC"  },
+    { 0x2E35, "Shenzhen PYS Industrial Co., LTD"  },
+    { 0x2E36, "Depo Electronics Limited"  },
+    { 0x2E37, "IRISO ELECTRONICS CO., LTD"  },
+    { 0x2E38, "OHM ELECTRONIC INC."  },
+    { 0x2E39, "Epic Tech, LLC"  },
+    { 0x2E3A, "Nanaboshi Electric Mfg. Co., Ltd."  },
+    { 0x2E3B, "uSens Inc"  },
+    { 0x2E3C, "ARTERY Technology Co., Ltd."  },
+    { 0x2E3D, "ASWAN ELEC. SALES CO., LTD."  },
+    { 0x2E3E, "Karma Automotive"  },
+    { 0x2E3F, "Poly-Planar Group LLC"  },
+    { 0x2E40, "Mobile Technologies Inc"  },
+    { 0x2E41, "DONGGUAN RONGDEKANG ELECTRONIC TECHNOLOGY CO., LTD."  },
+    { 0x2E42, "Hunan Ronghe Microelectronics Co., Ltd."  },
+    { 0x2E43, "Owl Labs, Inc"  },
+    { 0x2E44, "Idealens Technology (Chengdu) Co., Ltd."  },
+    { 0x2E45, "Widex A/S"  },
+    { 0x2E46, "Mobileconn Technology Co., Ltd."  },
+    { 0x2E47, "X-Media Tech, Inc."  },
+    { 0x2E48, "Andromium Inc."  },
+    { 0x2E49, "A&T Corporation"  },
+    { 0x2E4A, "Xiamen Jinhaode Electronic Co., Ltd"  },
+    { 0x2E4B, "ART SPA"  },
+    { 0x2E4C, "Carter Duncan Corp."  },
+    { 0x2E4D, "Vinpower, Inc."  },
+    { 0x2E4E, "METER Group, Inc"  },
+    { 0x2E4F, "Audiotec Fischer GmbH"  },
+    { 0x2E50, "beyerdynamic GmbH & Co. KG"  },
+    { 0x2E51, "EVER Sp. Z.o.o."  },
+    { 0x2E52, "Toughbuilt Industries Inc"  },
+    { 0x2E53, "Shenzhen East-Toptech Electronic Technology Co., Ltd"  },
+    { 0x2E54, "Yin Run Precise Metal Products CO., LTD."  },
+    { 0x2E55, "FIP Formatura Iniezione Polimeri an Aliaxis Company"  },
+    { 0x2E56, "Juchin Technology (JIANGXI) Co., Ltd"  },
+    { 0x2E57, "MEGWARE Computer Vertrieb und Service GmbH"  },
+    { 0x2E58, "GONGNIU GROUP CO., LTD."  },
+    { 0x2E59, "Maui Imaging, Inc."  },
+    { 0x2E5A, "Mysher Technology Co., Ltd."  },
+    { 0x2E5B, "Fitipower Integrated Technology Inc."  },
+    { 0x2E5C, "Y.H.S. Co., Ltd"  },
+    { 0x2E5D, "Dong Guan LM-Link Precise Electronic Co., Ltd."  },
+    { 0x2E5E, "Mei Shun He Electronic Limited"  },
+    { 0x2E5F, "Shenzhen BTC Technology Co., Ltd."  },
+    { 0x2E60, "castAR, Inc."  },
+    { 0x2E61, "NetBurner, Inc."  },
+    { 0x2E62, "Will Semiconductor Co., LTD"  },
+    { 0x2E63, "Polaris-Labs Shenzhen Co., Ltd"  },
+    { 0x2E64, "Shenzhen Kaibao Technology Co., Ltd."  },
+    { 0x2E65, "Kunshan Xintaili Precision Components Co., Ltd."  },
+    { 0x2E66, "SALICRU, S.A."  },
+    { 0x2E67, "Elevation Lab, Inc."  },
+    { 0x2E68, "Tessonics Inc."  },
+    { 0x2E69, "Swift Navigation Inc"  },
+    { 0x2E6A, "Wilderness Labs Inc."  },
+    { 0x2E6B, "DMX, LLC dba Mood Media"  },
+    { 0x2E6C, "Uwatec AG"  },
+    { 0x2E6D, "Laser Argentina S.A."  },
+    { 0x2E6E, "E4D Technologies LLC"  },
+    { 0x2E6F, "Areca Technology Corporation"  },
+    { 0x2E70, "Revision Electronics & Power Systems Inc."  },
+    { 0x2E71, "Futurepath Electronics Technology (Dongguan) Co., Ltd."  },
+    { 0x2E72, "DongGuan YongHao Electronics Co., LTD"  },
+    { 0x2E73, "Backyard Brains"  },
+    { 0x2E74, "Magenta Labs Inc."  },
+    { 0x2E75, "Shanghai Hinge Electronic Technologies Co., Ltd."  },
+    { 0x2E76, "Guangdong Jinrun Electronics Co., Ltd."  },
+    { 0x2E77, "LOGICDATA Electronics & Software Entwicklungs GmbH"  },
+    { 0x2E78, "ES Gear Ltd."  },
+    { 0x2E79, "NP System Development Co., Ltd."  },
+    { 0x2E7A, "Jiangsu BDSTAR Navigation Electronic Co., Ltd."  },
+    { 0x2E7B, "Terrada Music Score CO., Ltd."  },
+    { 0x2E7C, "Pyramid Solutions"  },
+    { 0x2E7D, "Shenzhen Xin Yong Yang Technology Co., Ltd."  },
+    { 0x2E7E, "ValueHD Corporation"  },
+    { 0x2E7F, "Aries Manufacturing - a division of Boss Tech Products Inc."  },
+    { 0x2E80, "Join Tek Corporation Co., Ltd."  },
+    { 0x2E81, "Zodiac Inflight Innovations"  },
+    { 0x2E82, "Sapphire Technology Limited"  },
+    { 0x2E83, "Ocean Tek Enterprise Co., Ltd."  },
+    { 0x2E84, "Sheng San Electronics (Shen Zhen) Co., Ltd."  },
+    { 0x2E85, "Verizon"  },
+    { 0x2E86, "SBO HEARING A/S"  },
+    { 0x2E87, "Shenzhen Injoinic Technology Co., Ltd."  },
+    { 0x2E88, "Huada Semiconductor Corporation Limited"  },
+    { 0x2E89, "Group Dekko, Inc."  },
+    { 0x2E8A, "Raspberry Pi (Trading) Limited"  },
+    { 0x2E8B, "Asia Optical International Ltd."  },
+    { 0x2E8C, "Aisino Wincor Manufacturing (Shanghai) Co., Ltd."  },
+    { 0x2E8D, "YSC Science Technique Electron (Yi Chun) Co., Ltd"  },
+    { 0x2E8E, "Bitatek CO., LTD"  },
+    { 0x2E8F, "Shenzhen Weiduli Technology Co., Ltd."  },
+    { 0x2E90, "Wireless Media Tech CO., Limited"  },
+    { 0x2E91, "Shenzhen Suprint Smart Technology Co., Ltd."  },
+    { 0x2E92, "bioMerieux, Inc."  },
+    { 0x2E93, "Shenzhen Huikeyuan Electronic Technology Co., Ltd."  },
+    { 0x2E94, "Graviton Inc."  },
+    { 0x2E95, "Scuf Gaming International, LLC"  },
+    { 0x2E96, "Aspect Microsystems Corp."  },
+    { 0x2E97, "Aerocool Advanced Technologies Corporation"  },
+    { 0x2E98, "Nekteck, Inc."  },
+    { 0x2E99, "Hynetek Semiconductor Co., Ltd"  },
+    { 0x2E9A, "MS Solutions Co., Ltd."  },
+    { 0x2E9B, "New Imaging Technologies"  },
+    { 0x2E9C, "Shenzhen Silkway Technology Co., Ltd."  },
+    { 0x2E9D, "Resolved Instruments Inc."  },
+    { 0x2E9E, "SoundAI Technology Co., Ltd."  },
+    { 0x2E9F, "EyeTech Digital Systems, Inc."  },
+    { 0x2EA0, "Magnescale Co., Ltd."  },
+    { 0x2EA1, "DASANELECTRON CO., LTD"  },
+    { 0x2EA2, "Ningbo Kangda Electronic Co., Ltd."  },
+    { 0x2EA3, "POSLAB Technology Corporation"  },
+    { 0x2EA4, "Hubbell Incorporated (Delaware), Wiring Device Kellems Division"  },
+    { 0x2EA5, "Dongguanshi Qitaiprecision Moulds Co., Ltd."  },
+    { 0x2EA6, "Foreign Trade Corporation dba. Technocel"  },
+    { 0x2EA7, "Muhanbit"  },
+    { 0x2EA8, "Changsha JingJia Microelectronics Co., LTD."  },
+    { 0x2EA9, "Yuneec International (China) Co., Ltd."  },
+    { 0x2EAA, "TSUME S.A."  },
+    { 0x2EAB, "Zong Cable Technology Co., Ltd."  },
+    { 0x2EAC, "Jia Yang Electronics (Dongguan) Co., Ltd."  },
+    { 0x2EAD, "Align Technology Inc."  },
+    { 0x2EAE, "Shenzhen TOMTOP Technology Co., Ltd."  },
+    { 0x2EAF, "microsonic co., ltd."  },
+    { 0x2EB0, "Commtech, Inc."  },
+    { 0x2EB1, "Samsung SmartThings"  },
+    { 0x2EB2, "Markus Klotz GmbH"  },
+    { 0x2EB3, "Shenzhen Tokwa Precision Technology Co., Ltd."  },
+    { 0x2EB4, "Beijer Automotive BV"  },
+    { 0x2EB5, "Dongguan HengYue Communication Technology Co., Ltd."  },
+    { 0x2EB6, "The Vehicle Group LTD"  },
+    { 0x2EB7, "Digital Divide Systems Ltd."  },
+    { 0x2EB8, "Yueqing Nuode Electronic Technology Co., Ltd."  },
+    { 0x2EB9, "SSI Computer Corp."  },
+    { 0x2EBA, "Shenzhen E&C Smart Link Technology Co., Ltd."  },
+    { 0x2EBB, "Shanghai Tuzheng Information Technology Co., Ltd."  },
+    { 0x2EBC, "RAIDON Technology Inc."  },
+    { 0x2EBD, "Netstor Technology Co., Ltd."  },
+    { 0x2EBE, "Delphi Automotive Systems, LLC"  },
+    { 0x2EBF, "Shenzhen D&D Technology Co., Ltd"  },
+    { 0x2EC0, "GuideTech"  },
+    { 0x2EC1, "Avid Identification Systems, Inc."  },
+    { 0x2EC2, "Loupedeck Oy"  },
+    { 0x2EC3, "Shenzhen Huntkey Electric Co., Ltd."  },
+    { 0x2EC4, "tetralux S.a.r.l."  },
+    { 0x2EC5, "Ariba Technology Co., LTD."  },
+    { 0x2EC6, "Facebook, Inc."  },
+    { 0x2EC7, "ITECH Electronic Co., Ltd."  },
+    { 0x2EC8, "Ningbo Prime Electronic Co., Ltd."  },
+    { 0x2EC9, "Shenzhou Rongan Technology (Beijing) Limited"  },
+    { 0x2ECA, "AQuantia Corp"  },
+    { 0x2ECB, "Zhejiang Quzhou Gelinte Wire and Cable Co., Ltd."  },
+    { 0x2ECC, "ASR Microelectronics (Shanghai) Co., Ltd."  },
+    { 0x2ECD, "EUROICC"  },
+    { 0x2ECE, "E-Lead Electronic Co., Ltd."  },
+    { 0x2ECF, "Fluo Technology Ltd."  },
+    { 0x2ED0, "Mind Alive Inc."  },
+    { 0x2ED1, "QBit Semiconductor LTD"  },
+    { 0x2ED2, "APOLLO GIKEN Co., Ltd."  },
+    { 0x2ED3, "Shenzhen Xinhongya Electronics Corporation"  },
+    { 0x2ED4, "Butterfly Network Inc."  },
+    { 0x2ED5, "QSAN Technology, Inc."  },
+    { 0x2ED6, "Shenzhen Xinliyang Co., Ltd."  },
+    { 0x2ED7, "Libratel Inc"  },
+    { 0x2ED8, "Dongguan Lontion Industrial Co., Ltd."  },
+    { 0x2ED9, "Microscopes International, LLC"  },
+    { 0x2EDA, "Wenzhou Haitong Communication Electronics Co., Ltd."  },
+    { 0x2EDB, "NeuroHabilitation Corporation"  },
+    { 0x2EDC, "Nippon Techno Lab., Inc."  },
+    { 0x2EDD, "reMarkable AS"  },
+    { 0x2EDE, "Technik Industrial Company Limited"  },
+    { 0x2EDF, "Huizhou Wealth Metal Micro Control Limited"  },
+    { 0x2EE0, "Pogotec Inc."  },
+    { 0x2EE1, "Safetrust Inc"  },
+    { 0x2EE2, "Kashimura Co., Ltd."  },
+    { 0x2EE3, "Kin Keung Electrical Mfg. Ltd."  },
+    { 0x2EE4, "Osprey Video, Inc."  },
+    { 0x2EE6, "NEURODIGITAL TECHNOLOGIES, S.L."  },
+    { 0x2EE7, "GOOGFIT TECH LIMITED"  },
+    { 0x2EE8, "Zunidata Systems, Inc."  },
+    { 0x2EE9, "Adigal LLC"  },
+    { 0x2EEA, "Loma Systems"  },
+    { 0x2EEB, "Jianduan Technology (Shenzhen) Co., Ltd."  },
+    { 0x2EEC, "Sensor Industries Limited"  },
+    { 0x2EED, "Shenzhen Panhui Technologies Co., Ltd."  },
+    { 0x2EEE, "Beijing Qunli Tiancheng Network Technology Company"  },
+    { 0x2EEF, "Booz Allen Hamilton"  },
+    { 0x2EF0, "Zhongshan Auxus Electronic Technology Co., Ltd."  },
+    { 0x2EF1, "Tatvik Biosystems Private Limited"  },
+    { 0x2EF2, "Shenzhen Goodwin Technology Co., Ltd."  },
     { 0x2FB2, "Fujitsu Limited"  },
     { 0x3176, "WHANAM ELECTRONICS CO., Ltd. MS division"  },
     { 0x3552, "BD Consumer Healthcare"  },
@@ -10335,7 +10990,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0x4317, "Broadcom WLAN"  },
     { 0x4426, "TANITA Corporation"  },
     { 0x4745, "Beijing Tiertime Technology Co., Ltd."  },
-    { 0x4791, "HGST BRANDED BUSINESS"  },
+    { 0x4791, "Western Digital, G-Tech"  },
     { 0x4909, "GE Healthcare Bio-Sciences AB"  },
     { 0x4971, "HITACHI GLOBAL STORAGE TECHNOLOGIES"  },
     { 0x4B53, "Key Soft Service"  },
@@ -10373,6 +11028,7 @@ VENDOR_ID USBVendorIDs[] =
     { 0xFF01, "DisplayPort (VESA)"  },
     { 0xFF02, "MHL, LLC"  },
     { 0xFF03, "MIPI Debug"  },
+    { 0xFF04, "HDMI"  },
     { 0x0000, "Vendor ID not listed with USB.org"  }
 };
 
diff --git a/usb/wdf_osrfx2_lab/README.md b/usb/wdf_osrfx2_lab/README.md
index 6940418f..14cb90e8 100644
--- a/usb/wdf_osrfx2_lab/README.md
+++ b/usb/wdf_osrfx2_lab/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WDF Sample Driver Learning Lab for OSR USB-FX2
+    platform: UMDF1 KMDF
+    language: cpp
+    category: USB
+    description: Contains a console test application and a series of iterative drivers for both KMDF and UMDF version 1.
+    samplefwlink: https://go.microsoft.com/fwlink/?linkid=856746
+--->
+
+
 WDF Sample Driver Learning Lab for OSR USB-FX2
 ==============================================
 
diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.vcxproj b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.vcxproj
index 1ec8c281..43a6ba8c 100644
--- a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.vcxproj
+++ b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.vcxproj
@@ -152,7 +152,7 @@
     <ClCompile Include="step1.c" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.vcxproj b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.vcxproj
index 5a1b9666..281bba9c 100644
--- a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.vcxproj
+++ b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.vcxproj
@@ -152,7 +152,7 @@
     <ClCompile Include="step2.c" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.vcxproj b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.vcxproj
index 569cda97..312b81da 100644
--- a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.vcxproj
+++ b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.vcxproj
@@ -152,7 +152,7 @@
     <ClCompile Include="step3.c" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.vcxproj b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.vcxproj
index 13904fea..f4605118 100644
--- a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.vcxproj
+++ b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.vcxproj
@@ -152,7 +152,7 @@
     <ClCompile Include="step4.c" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.vcxproj b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.vcxproj
index 38f8d8e4..157cb7c8 100644
--- a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.vcxproj
+++ b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.vcxproj
@@ -169,7 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.inx b/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.inx
index dea03ff6..69f0c0c4 100644
--- a/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.inx
+++ b/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.inx
diff --git a/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.vcxproj b/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.vcxproj
index aef4ae60..be860e25 100644
--- a/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.vcxproj
+++ b/usb/wdf_osrfx2_lab/umdf/step1/WUDFOsrUsbFx2_1.vcxproj
@@ -252,7 +252,7 @@
     <ResourceCompile Include="OsrUsbFx2.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.inx b/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.inx
index 17baa44d..98d8c453 100644
--- a/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.inx
+++ b/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.inx
diff --git a/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.vcxproj b/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.vcxproj
index ee7c654f..833776a8 100644
--- a/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.vcxproj
+++ b/usb/wdf_osrfx2_lab/umdf/step2/WUDFOsrUsbFx2_2.vcxproj
@@ -252,7 +252,7 @@
     <ResourceCompile Include="OsrUsbFx2.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.inx b/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.inx
index 729c6aef..c4846f6e 100644
--- a/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.inx
+++ b/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.inx
diff --git a/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.vcxproj b/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.vcxproj
index 25e7b78b..9e8b452a 100644
--- a/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.vcxproj
+++ b/usb/wdf_osrfx2_lab/umdf/step3/WUDFOsrUsbFx2_3.vcxproj
@@ -252,7 +252,7 @@
     <ResourceCompile Include="OsrUsbFx2.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.inx b/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.inx
index 3eaae162..215e5f98 100644
--- a/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.inx
+++ b/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.inx
diff --git a/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.vcxproj b/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.vcxproj
index 725e33b5..56247b8e 100644
--- a/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.vcxproj
+++ b/usb/wdf_osrfx2_lab/umdf/step4/WUDFOsrUsbFx2_4.vcxproj
@@ -252,7 +252,7 @@
     <ResourceCompile Include="OsrUsbFx2.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inf)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>