7 files changed, 18 insertions, 8 deletions
diff --git a/avstream/avscamera/avstream-avscamera.yaml b/avstream/avscamera/avstream-avscamera.yml
index c4b4e71b..25e4b8e9 100644
--- a/avstream/avscamera/avstream-avscamera.yaml
+++ b/avstream/avscamera/avstream-avscamera.yml
@@ -3,8 +3,10 @@ sample:
 - name: AvsCamera - AVStream Camera Sample Driver
   description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/avscamera/avscamera.sln
diff --git a/avstream/avshws/avstream-avshws.yaml b/avstream/avshws/avstream-avshws.yml
index 08a6bb4a..fb3799fc 100644
--- a/avstream/avshws/avstream-avshws.yaml
+++ b/avstream/avshws/avstream-avshws.yml
@@ -3,8 +3,10 @@ sample:
 - name: AVStream simulated hardware sample driver (Avshws)
   description: A simulated hardware sample driver providing a pin-centric capture driver to simulate AV capture hardware.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/avshws/avshws.sln
diff --git a/avstream/avssamp/avstream-avssamp.yaml b/avstream/avssamp/avstream-avssamp.yml
index 495c207d..9b36d54b 100644
--- a/avstream/avssamp/avstream-avssamp.yaml
+++ b/avstream/avssamp/avstream-avssamp.yml
@@ -3,8 +3,10 @@ sample:
 - name: AVStream filter-centric simulated capture sample driver (Avssamp)
   description: An AVStream filter-centric simulated capture sample driver with functional audio.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/avssamp/avssamp.sln
diff --git a/avstream/sampledevicemft/README.md b/avstream/sampledevicemft/README.md
index 2b79c451..79ddc9f0 100644
--- a/avstream/sampledevicemft/README.md
+++ b/avstream/sampledevicemft/README.md
@@ -23,7 +23,7 @@ Related topics
 
 **Concepts**
 
-[Windows Store device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
+[UWP device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
 
 [Media Foundation Transforms](http://msdn.microsoft.com/en-us/library/windows/hardware/ms703138)
 
@@ -33,6 +33,6 @@ Related topics
 
 **Samples**
 
-[Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
+[Device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
 
 [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441%20)
diff --git a/avstream/sampledevicemft/avstream-sampledevicemft.yaml b/avstream/sampledevicemft/avstream-sampledevicemft.yml
index d1e877c4..84ffd6d0 100644
--- a/avstream/sampledevicemft/avstream-sampledevicemft.yaml
+++ b/avstream/sampledevicemft/avstream-sampledevicemft.yml
@@ -3,8 +3,10 @@ sample:
 - name: Driver Device Transform Sample
   description: A driver device transform which loads in a process streaming an Avstream based camera device using Media Foundation.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/sampledevicemft/SampleDeviceMft.sln
diff --git a/avstream/samplemft0/README.md b/avstream/samplemft0/README.md
index 42f23db4..111d4073 100644
--- a/avstream/samplemft0/README.md
+++ b/avstream/samplemft0/README.md
@@ -3,16 +3,16 @@
     platform: WDM
     language: cpp
     category: Camera
-    description: A driver MFT for use with a camera's Windows Store device app.
+    description: A driver MFT for use with a camera's UWP device app.
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617126
 --->
 
 Driver MFT Sample
 =================
 
-Provides a *driver MFT* for use with a camera's Windows Store device app.A *driver MFT* is a Media Foundation Transform that's used with a specific camera when capturing video. The driver MFT is also known as MFT0 because it is the first MFT applied to the video stream captured from the camera. This MFT can provide a video effect or other processing when capturing photos or video from the camera. It can be distributed along with the driver package for a camera.
+Provides a *driver MFT* for use with a camera's UWP device app.A *driver MFT* is a Media Foundation Transform that's used with a specific camera when capturing video. The driver MFT is also known as MFT0 because it is the first MFT applied to the video stream captured from the camera. This MFT can provide a video effect or other processing when capturing photos or video from the camera. It can be distributed along with the driver package for a camera.
 
-In this sample, the driver MFT, when enabled, replaces a portion of the captured video with a green box. To test this sample, download the [Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) and the [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441). The [Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) provides a *Windows Store device app* that controls the effect implemented by the driver MFT. The [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441) provides a way to invoke the *Windows Store device app*.
+In this sample, the driver MFT, when enabled, replaces a portion of the captured video with a green box. To test this sample, download the [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) and the [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441). The [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) provides a *UWP device app* that controls the effect implemented by the driver MFT. The [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441) provides a way to invoke the *UWP device app*.
 
 This sample is designed to be used with a specific camera. To run the sample, you need the your camera's device ID and device metadata package.
 
@@ -22,7 +22,7 @@ Related topics
 
 **Concepts**
 
-[Windows Store device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
+[UWP device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
 
 [Media Foundation Transforms](http://msdn.microsoft.com/en-us/library/windows/hardware/ms703138)
 
@@ -32,6 +32,6 @@ Related topics
 
 **Samples**
 
-[Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
+[Device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
 
 [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441%20)
diff --git a/avstream/samplemft0/avstream-samplemft0.yaml b/avstream/samplemft0/avstream-samplemft0.yml
index 43ea7515..5a4e4c0a 100644
--- a/avstream/samplemft0/avstream-samplemft0.yaml
+++ b/avstream/samplemft0/avstream-samplemft0.yml
@@ -1,10 +1,12 @@
 ### YamlMime:Sample
 sample:
 - name: Driver MFT Sample
-  description: A driver MFT for use with a camera's Windows Store device app.
+  description: A driver MFT for use with a camera's Windows device app.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/samplemft0/SampleMft0.sln