terminology changes

39 files changed, 78 insertions, 78 deletions

diff --git a/bluetooth/serialhcibus/ReadMe.md b/bluetooth/serialhcibus/ReadMe.md
index 871bb9e1..31f0c358 100644
--- a/bluetooth/serialhcibus/ReadMe.md
+++ b/bluetooth/serialhcibus/ReadMe.md
@@ -3,8 +3,8 @@ Bluetooth Serial HCI Bus Driver
 
 The purpose of this sample is to demonstrate how to implement a basic bus driver to support the new [Bluetooth Extensibility transport DDIs](http://msdn.microsoft.com/en-us/library/windows/hardware/ff536585) over the UART transport. Such a serial bus driver can support a multi-radio device over the UART transport and utilize a common Bluetooth HCI packet for communication. The lower edge of this driver interfaces with a UART controller following the Bluetooth SIG’s UART (H4) transport protocol.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 **Note**: This sample driver is generic i.e. it is not designed for a specific device and allows for a vendor to adopt and enhance it for supporting Bluetooth
 
diff --git a/filesys/cdfs/ReadMe.md b/filesys/cdfs/ReadMe.md
index de052d82..601b22bf 100644
--- a/filesys/cdfs/ReadMe.md
+++ b/filesys/cdfs/ReadMe.md
@@ -5,6 +5,6 @@ The CD-ROM file system driver (cdfs) sample is a sample file system driver that
 
 Cdfs is a read-only file system that addresses various issues such as accessing data on disk, interacting with the cache manager, and handling various I/O operations such as opening files, performing reads on a file, retrieving information on a file, and performing various control operations on the file system. The Cdfs file system is included with the Microsoft Windows operating system.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
diff --git a/filesys/miniFilter/MetadataManager/ReadMe.md b/filesys/miniFilter/MetadataManager/ReadMe.md
index 52230ee1..6df7bd91 100644
--- a/filesys/miniFilter/MetadataManager/ReadMe.md
+++ b/filesys/miniFilter/MetadataManager/ReadMe.md
@@ -3,8 +3,8 @@ Metadata Manager File System Minifilter Driver
 
 The Metadata Manager minifilter sample serves as an example if you want to use files for storing metadata that corresponds to your minifilters. The implementation of this sample depicts scenarios in which modifications to the file might have to be blocked or the minifilter might be required to close the file temporarily.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/avscan/ReadMe.md b/filesys/miniFilter/avscan/ReadMe.md
index f17c27c2..31954fec 100644
--- a/filesys/miniFilter/avscan/ReadMe.md
+++ b/filesys/miniFilter/avscan/ReadMe.md
@@ -3,6 +3,6 @@ AvScan File System Minifilter Driver
 
 The AvScan minifilter is a transaction-aware file scanner. This is an example for developers who intend to write filters that examine data in files. Typically, anti-virus products fall into this category.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
diff --git a/filesys/miniFilter/cancelSafe/ReadMe.md b/filesys/miniFilter/cancelSafe/ReadMe.md
index 786b331f..c8cacf28 100644
--- a/filesys/miniFilter/cancelSafe/ReadMe.md
+++ b/filesys/miniFilter/cancelSafe/ReadMe.md
@@ -3,8 +3,8 @@ CancelSafe File System Minifilter Driver
 
 The CancelSafe filter is a sample minifilter that you use if you want to use cancel-safe queues.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/cdo/ReadMe.md b/filesys/miniFilter/cdo/ReadMe.md
index 750de7b7..4f37890f 100644
--- a/filesys/miniFilter/cdo/ReadMe.md
+++ b/filesys/miniFilter/cdo/ReadMe.md
@@ -5,8 +5,8 @@ The CDO minifilter sample is an example if you intend to use a control device ob
 
 Although the filter manager infrastructure provides a message interface for communication between applications and minifilters, you might need explicit CDOs while the minifilters interface with legacy software. This sample shows how to create and use a CDO with minifilters.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/change/ReadMe.md b/filesys/miniFilter/change/ReadMe.md
index b40130e6..6d541083 100644
--- a/filesys/miniFilter/change/ReadMe.md
+++ b/filesys/miniFilter/change/ReadMe.md
@@ -12,6 +12,6 @@ The primary tasks of the filter for tracking a transacted file are the following
 3.  In the kernel transaction manager (KTM) notification callback, if the transaction is committed, then propagate the dirty information from the transacted dirty record to the non-transacted dirty record; if rollback, do not propagate.
 4.  Properly remove the context structure in the TransactionContextCleanup routine.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
diff --git a/filesys/miniFilter/ctx/ReadMe.md b/filesys/miniFilter/ctx/ReadMe.md
index e9dd284e..7609985a 100644
--- a/filesys/miniFilter/ctx/ReadMe.md
+++ b/filesys/miniFilter/ctx/ReadMe.md
@@ -3,8 +3,8 @@ Ctx File System Minifilter Driver
 
 The Ctx minifilter is an example that demonstrates how to attach contexts to instances, files, streams, and stream handles in your minifilter.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/delete/ReadMe.md b/filesys/miniFilter/delete/ReadMe.md
index 50cfb0dd..0cf71ced 100644
--- a/filesys/miniFilter/delete/ReadMe.md
+++ b/filesys/miniFilter/delete/ReadMe.md
@@ -3,8 +3,8 @@ Delete File System Minifilter Driver
 
 The Delete minifilter is an example that demonstrates how to detect deletions of files or streams. Deletions are reported as debug output.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/minispy/ReadMe.md b/filesys/miniFilter/minispy/ReadMe.md
index 12c114d2..ca3749d3 100644
--- a/filesys/miniFilter/minispy/ReadMe.md
+++ b/filesys/miniFilter/minispy/ReadMe.md
@@ -3,8 +3,8 @@ Minispy File System Minifilter Driver
 
 The Minispy sample is a tool to monitor and log any I/O and transaction activity that occurs in the system. Minispy is implemented as a minifilter.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/nullFilter/ReadMe.md b/filesys/miniFilter/nullFilter/ReadMe.md
index 376618e7..06d825eb 100644
--- a/filesys/miniFilter/nullFilter/ReadMe.md
+++ b/filesys/miniFilter/nullFilter/ReadMe.md
@@ -3,8 +3,8 @@ NullFilter File System Minifilter Driver
 
 The NullFilter minifilter is a sample minifilter that shows how to register a minifilter with the filter manager.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/passThrough/ReadMe.md b/filesys/miniFilter/passThrough/ReadMe.md
index cccc85de..91230df5 100644
--- a/filesys/miniFilter/passThrough/ReadMe.md
+++ b/filesys/miniFilter/passThrough/ReadMe.md
@@ -3,8 +3,8 @@ PassThrough File System Minifilter Driver
 
 The PassThrough minifilter demonstrates how to specify callback functions for different types of I/O requests.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/scanner/ReadMe.md b/filesys/miniFilter/scanner/ReadMe.md
index 979b2c25..46009e9a 100644
--- a/filesys/miniFilter/scanner/ReadMe.md
+++ b/filesys/miniFilter/scanner/ReadMe.md
@@ -3,8 +3,8 @@ Scanner File System Minifilter Driver
 
 The Scanner minifilter is an example for developers who intend to write filters that examine data in files. Typically, antivirus products fall into this category.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/simrep/ReadMe.md b/filesys/miniFilter/simrep/ReadMe.md
index 03c6847c..fcf31965 100644
--- a/filesys/miniFilter/simrep/ReadMe.md
+++ b/filesys/miniFilter/simrep/ReadMe.md
@@ -3,8 +3,8 @@ SimRep File System Minifilter Driver
 
 SimRep is a sample filter that demonstrates how a file system filter can simulate file-system like reparse-point behavior to redirect a file open to an alternate path.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/filesys/miniFilter/swapBuffers/ReadMe.md b/filesys/miniFilter/swapBuffers/ReadMe.md
index da19b5ed..e57b38a5 100644
--- a/filesys/miniFilter/swapBuffers/ReadMe.md
+++ b/filesys/miniFilter/swapBuffers/ReadMe.md
@@ -3,8 +3,8 @@ SwapBuffer File System Minifilter Driver
 
 The SwapBuffers minifilter demonstrates how to switch buffers between reads and writes of data. This technique is particularly useful for encryption filters because they have to encrypt data before writing it to disk and decrypt it after reading it from disk. Because encryption/decryption has to be done transparently, you cannot use system-supplied buffers directly, so intermediate buffers have to be introduced.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Design and Operation
 --------------------
diff --git a/general/echo/kmdf/ReadMe.md b/general/echo/kmdf/ReadMe.md
index ec2244c8..d1171f19 100644
--- a/general/echo/kmdf/ReadMe.md
+++ b/general/echo/kmdf/ReadMe.md
@@ -5,8 +5,8 @@ The ECHO (KMDF) sample demonstrates how to use a sequential queue to serialize r
 
 It also shows how to synchronize execution of these events with other asynchronous events such as request cancellation and DPC.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 **Note**
 Due to a known bug in the current Windows Driver Kit tools, when building this sample in Debug mode, the exe project may report some ApiValidator warnings. These can be safely ignored.
diff --git a/general/echo/umdf2/ReadMe.md b/general/echo/umdf2/ReadMe.md
index 18fc9b23..adc0a6cf 100644
--- a/general/echo/umdf2/ReadMe.md
+++ b/general/echo/umdf2/ReadMe.md
@@ -5,8 +5,8 @@ The ECHO (UMDF version 2) sample demonstrates how to use a sequential queue to s
 
 It also shows how to synchronize execution of these events with other asynchronous events such as request cancellation and DPC.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 **Note**
 Due to a known bug in the current Windows Driver Kit tools, when building this sample in Debug mode, the exe project may report some ApiValidator warnings. These can be safely ignored.
diff --git a/network/modem/fakemodem/ReadMe.md b/network/modem/fakemodem/ReadMe.md
index 6d6cdbc1..b79071cb 100644
--- a/network/modem/fakemodem/ReadMe.md
+++ b/network/modem/fakemodem/ReadMe.md
@@ -3,6 +3,6 @@ Fakemodem Driver
 
 The Fakemodem sample demonstrates a simple controller-less modem driver. This driver supports sending and receiving AT commands using the `ReadFile`/`WriteFile` calls or via a TAPI interface using an application such as *HyperTerminal.*
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
diff --git a/network/trans/ddproxy/ReadMe.md b/network/trans/ddproxy/ReadMe.md
index 67a6b213..a9e1d427 100644
--- a/network/trans/ddproxy/ReadMe.md
+++ b/network/trans/ddproxy/ReadMe.md
@@ -3,8 +3,8 @@ Windows Filtering Platform Packet Modification Sample
 
 The sample driver demonstrates the packet modification capabilities of the Windows Filtering Platform (WFP).
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Run the sample
 --------------
diff --git a/network/trans/inspect/ReadMe.md b/network/trans/inspect/ReadMe.md
index a288e694..ef7fc9e8 100644
--- a/network/trans/inspect/ReadMe.md
+++ b/network/trans/inspect/ReadMe.md
@@ -11,8 +11,8 @@ Inspect.sys implements the `ClassifyFn` callout functions for the ALE Connect, R
 
 Connect/Packet inspection is done out-of-band by a system worker thread by using the reference-drop-clone-reinject mechanism as well as the ALE pend/complete mechanism. Therefore, the sample can serve as a basis for scenarios in which a filtering decision cannot be made within the `classifyFn()` callout and instead must be made, for example, by a user-mode application.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Automatic deployment
 --------------------
diff --git a/network/trans/stmedit/ReadMe.md b/network/trans/stmedit/ReadMe.md
index da921272..e6f48340 100644
--- a/network/trans/stmedit/ReadMe.md
+++ b/network/trans/stmedit/ReadMe.md
@@ -3,8 +3,8 @@ Windows Filtering Platform Stream Edit Sample
 
 This sample driver demonstrates replacing a string pattern for a Transmission Control Protocol (TCP) connection using the Windows Filtering Platform (WFP).
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 The sample consists of a kernel-mode Windows Filtering Platform (WFP) callout driver (Stmedit.sys) that can operate in one of the following modes:
 
diff --git a/pofx/UMDF2/ReadMe.md b/pofx/UMDF2/ReadMe.md
index cca46fdf..5778bc45 100644
--- a/pofx/UMDF2/ReadMe.md
+++ b/pofx/UMDF2/ReadMe.md
@@ -3,8 +3,8 @@ Power Framework (PoFx) Sample (UMDF Version 2)
 
 This solution demonstrates how a User-Mode Driver Framework (UMDF) version 2 driver can implement F-state-based power management. The SingleComp project demonstrates how a UMDF version 2 driver can implement F-state-based power management for a device that has only a single component.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 **Note**
 Due to a known bug in the current Windows Driver Kit tools, when building this sample in Debug mode, the exe project may report some ApiValidator warnings. These can be safely ignored.
diff --git a/pofx/WDF/ReadMe.md b/pofx/WDF/ReadMe.md
index 74cec6e0..2d59df4c 100644
--- a/pofx/WDF/ReadMe.md
+++ b/pofx/WDF/ReadMe.md
@@ -3,8 +3,8 @@ KMDF Power Framework (PoFx) Sample
 
 This solution consists of two samples that demonstrate how a KMDF driver can implement F-state-based power management. The SingleComp sample demonstrates how a KMDF driver can implement F-state-based power management for a device that has only a single component. The MultiComp sample demonstrates how a KMDF driver can implement F-state-based power management for a device that has an arbitrary number of components that can be individually power-managed.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 **Note**
 Due to a known bug in the current Windows Driver Kit tools, when building this sample in Debug mode, the exe project may report some ApiValidator warnings. These can be safely ignored.
diff --git a/sd/miniport/sdhc/README.md b/sd/miniport/sdhc/README.md
index b5c35093..a1fafe5c 100644
--- a/sd/miniport/sdhc/README.md
+++ b/sd/miniport/sdhc/README.md
@@ -3,8 +3,8 @@ Standard SD Host Controller Miniport
 
 This is a sample for a Secure Digital (SD) Host Controller miniport driver. The driver works in conjunction with sdport.sys, which implements SD/SDIO/eMMC protocol and WDM interfaces, to provide the host register interface.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 This driver, sdhc.sys, provides a functional miniport implementation for a standard SD host controller. However, it does not have support for many more recent features such as:
 
diff --git a/sd/sdiomars/ReadMe.md b/sd/sdiomars/ReadMe.md
index 313f0dd5..297d4509 100644
--- a/sd/sdiomars/ReadMe.md
+++ b/sd/sdiomars/ReadMe.md
@@ -3,8 +3,8 @@ Storage SDIO Driver
 
 This is a sample for a functional Secure Digital (SD) IO driver. The driver is written using the Kernel Mode Driver Framework. It is a driver for a generic mars development board that implements the SDIO protocol without additional functionality.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 The mars board driver exemplifies several different functions that are essential for writing an SDIO driver that leverages KDMF and the SDBUS API. It will show how to:
 
diff --git a/sensors/ADXL345Acc/ReadMe.md b/sensors/ADXL345Acc/ReadMe.md
index 4a7282a6..bc3f9de3 100644
--- a/sensors/ADXL345Acc/ReadMe.md
+++ b/sensors/ADXL345Acc/ReadMe.md
@@ -3,5 +3,5 @@ ADXL345Accelerometer
 
 The ADXL345Accelerometer sample shows how to write a UMDF v2 driver to control an ADXL345 accelerometer chip.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
diff --git a/sensors/Activity/ReadMe.md b/sensors/Activity/ReadMe.md
index 2b7bb407..aa8fcf09 100644
--- a/sensors/Activity/ReadMe.md
+++ b/sensors/Activity/ReadMe.md
@@ -3,6 +3,6 @@ Activity
 
 The activity sensor sample shows how to write a UMDF v2 driver to control a virtual activity sensor.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
diff --git a/sensors/CustomSensors/ReadMe.md b/sensors/CustomSensors/ReadMe.md
index 0b55f1b8..3e4a3a65 100644
--- a/sensors/CustomSensors/ReadMe.md
+++ b/sensors/CustomSensors/ReadMe.md
@@ -3,5 +3,5 @@ CustomSensors
 
 The CustomSensors sample shows how to write a UMDF v2 driver to control a virtual CO2 sensor.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
diff --git a/sensors/Pedometer/ReadMe.md b/sensors/Pedometer/ReadMe.md
index 10349781..671589e4 100644
--- a/sensors/Pedometer/ReadMe.md
+++ b/sensors/Pedometer/ReadMe.md
@@ -3,5 +3,5 @@ Pedometer
 
 The Pedometer sample shows how to write a UMDF v2 driver to control a virtual Pedometer sensor.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
diff --git a/sensors/SimpleDeviceOrientationSensor/ReadMe.md b/sensors/SimpleDeviceOrientationSensor/ReadMe.md
index 7ba5209b..21f6e16f 100644
--- a/sensors/SimpleDeviceOrientationSensor/ReadMe.md
+++ b/sensors/SimpleDeviceOrientationSensor/ReadMe.md
@@ -3,5 +3,5 @@ SimpleDeviceOrientationSensor
 
 The SimpleDeviceOrientationSensor sample shows how to write a UMDF v2 sensor driver to output Simple Device Orientation values.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
diff --git a/serial/serial/ReadMe.md b/serial/serial/ReadMe.md
index e1008572..7fe112cf 100644
--- a/serial/serial/ReadMe.md
+++ b/serial/serial/ReadMe.md
@@ -3,8 +3,8 @@ Serial Port Driver
 
 The Serial (16550-based RS-232) sample driver is a WDF version of the inbox Serial.sys driver in %WINDIR%\\system32\\drivers.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 This sample driver is functionally equivalent to the inbox driver, with these two exceptions:
 
diff --git a/storage/class/classpnp/ReadMe.md b/storage/class/classpnp/ReadMe.md
index 136dbe9d..c3a893ba 100644
--- a/storage/class/classpnp/ReadMe.md
+++ b/storage/class/classpnp/ReadMe.md
@@ -3,8 +3,8 @@ ClassPnP Storage Class Driver Library
 
 This library is the library for all storage drivers. It simplifies writing a storage class driver by implementing 90 percent of the code that you need to support Plug and Play (PnP), power management, and so on. This library is used by disk, CDROM, and the tape class drivers.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Installation and Operation
 --------------------------
diff --git a/storage/miniports/lsi_u3/ReadMe.md b/storage/miniports/lsi_u3/ReadMe.md
index af3a5a3f..2e7950ea 100644
--- a/storage/miniports/lsi_u3/ReadMe.md
+++ b/storage/miniports/lsi_u3/ReadMe.md
@@ -3,8 +3,8 @@ LSI\_U3 StorPort Miniport Driver
 
 The LSI\_U3 sample is an adapter driver for use with Parallel SCSI Host Bus Adapters or on-motherboard solutions that use the LSI 53C1010 SCSI ASIC.These sources are presented for your education and use with these generally available LSI SCSI-class adapters. The intended use of this sample driver is for this purpose only.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Installation and Operation
 --------------------------
diff --git a/storage/miniports/storahci/ReadMe.md b/storage/miniports/storahci/ReadMe.md
index f8b0d603..7705ebd5 100644
--- a/storage/miniports/storahci/ReadMe.md
+++ b/storage/miniports/storahci/ReadMe.md
@@ -3,6 +3,6 @@ StorAhci StorPort Miniport Driver
 
 The StorAhci sample is a Storport ACHI miniport driver.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
diff --git a/storage/sfloppy/ReadMe.md b/storage/sfloppy/ReadMe.md
index f30bca12..be7bd211 100644
--- a/storage/sfloppy/ReadMe.md
+++ b/storage/sfloppy/ReadMe.md
@@ -3,8 +3,8 @@ Super Floppy (sfloppy) Storage Class Driver
 
 The sfloppy sample is a super floppy driver. This driver is a class driver for Super Floppy disk drives.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Installation and Operation
 --------------------------
diff --git a/thermal/simsensor/ReadMe.md b/thermal/simsensor/ReadMe.md
index 6d59171e..668c5b56 100644
--- a/thermal/simsensor/ReadMe.md
+++ b/thermal/simsensor/ReadMe.md
@@ -3,8 +3,8 @@ SimSensor: Simulated Temperature Sensor Sample Driver
 
 This sample is a driver for a simulated temperature sensor device.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 A hardware platform designer can strategically place temperature sensors in various thermal zones around the platform. The operating system gets the temperature readings from the temperature sensor drivers and uses these readings to regulate the temperatures across the platform. Regulation can be either passive or active. For more information, see [Device-Level Thermal Management](http://msdn.microsoft.com/en-us/library/windows/hardware/hh698236).
 
diff --git a/thermal/thermalclient/ReadMe.md b/thermal/thermalclient/ReadMe.md
index aa886303..4ebcb51f 100644
--- a/thermal/thermalclient/ReadMe.md
+++ b/thermal/thermalclient/ReadMe.md
@@ -3,7 +3,7 @@ SimThermalClient: Simulated Thermal Client Sample Driver
 
 This sample is a driver for a simulated device that is a client of Windows thermal management. This driver publishes a [GUID\_THERMAL\_COOLING\_INTERFACE](http://msdn.microsoft.com/en-us/library/windows/hardware/hh698265) driver interface. Support for this interface is available starting with Windows 8.1. Drivers publish this interface so that they can participate in global thermal management under the coordination of the Windows operating system.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 For more information, see [Device-Level Thermal Management](http://msdn.microsoft.com/en-us/library/windows/hardware/hh698236).
diff --git a/usb/umdf2_fx2/ReadMe.md b/usb/umdf2_fx2/ReadMe.md
index 2f89407e..4f825de5 100644
--- a/usb/umdf2_fx2/ReadMe.md
+++ b/usb/umdf2_fx2/ReadMe.md
@@ -3,8 +3,8 @@ Sample UMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
 
 The umdf\_fx2 sample is a User-Mode Driver Framework (UMDF) driver for the OSR USB-FX2 device. It includes a test app and sample device metadata, and supports impersonation and idle power down.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 The sample can also be used with the CustomDeviceAccess MSDK sample. The sample demonstrates how to perform bulk and interrupt data transfers to an USB device. The specification for the device is at <http://www.osronline.com/hardware/OSRFX2_32.pdf>. The driver and sample device metadata also work with the [Custom driver access](http://go.microsoft.com/fwlink/p/?LinkID=248288) sample.
 
diff --git a/wmi/wmisamp/ReadMe.md b/wmi/wmisamp/ReadMe.md
index 5c3a599c..f5c9ed38 100644
--- a/wmi/wmisamp/ReadMe.md
+++ b/wmi/wmisamp/ReadMe.md
@@ -3,8 +3,8 @@ Sample KMDF Driver Implementing a WMI Data Provider
 
 WmiSamp WMI Provider is a sample KMDF driver that implements a WMI data provider.
 
-## Universal Compliant
-This sample builds a Windows Universal driver. It uses only APIs and DDIs that are included in Windows Core.
+## Universal Windows Driver Compliant
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 The sample demonstrates how to register the WMI providers and create provider instances for the Framework device object. It also illustrates how to handle the WMI queries sent to the device.