diff --git a/samples/BindingTest/App.config b/samples/BindingDemo/App.config
similarity index 100%
rename from samples/BindingTest/App.config
rename to samples/BindingDemo/App.config
diff --git a/samples/BindingTest/App.xaml b/samples/BindingDemo/App.xaml
similarity index 100%
rename from samples/BindingTest/App.xaml
rename to samples/BindingDemo/App.xaml
diff --git a/samples/BindingTest/App.xaml.cs b/samples/BindingDemo/App.xaml.cs
similarity index 100%
rename from samples/BindingTest/App.xaml.cs
rename to samples/BindingDemo/App.xaml.cs
diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingDemo/BindingDemo.csproj
similarity index 100%
rename from samples/BindingTest/BindingTest.csproj
rename to samples/BindingDemo/BindingDemo.csproj
diff --git a/samples/BindingTest/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml
similarity index 100%
rename from samples/BindingTest/MainWindow.xaml
rename to samples/BindingDemo/MainWindow.xaml
diff --git a/samples/BindingTest/MainWindow.xaml.cs b/samples/BindingDemo/MainWindow.xaml.cs
similarity index 100%
rename from samples/BindingTest/MainWindow.xaml.cs
rename to samples/BindingDemo/MainWindow.xaml.cs
diff --git a/samples/BindingTest/TestItemView.xaml b/samples/BindingDemo/TestItemView.xaml
similarity index 100%
rename from samples/BindingTest/TestItemView.xaml
rename to samples/BindingDemo/TestItemView.xaml
diff --git a/samples/BindingTest/TestItemView.xaml.cs b/samples/BindingDemo/TestItemView.xaml.cs
similarity index 100%
rename from samples/BindingTest/TestItemView.xaml.cs
rename to samples/BindingDemo/TestItemView.xaml.cs
diff --git a/samples/BindingTest/ViewModels/DataAnnotationsErrorViewModel.cs b/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs
similarity index 100%
rename from samples/BindingTest/ViewModels/DataAnnotationsErrorViewModel.cs
rename to samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs
diff --git a/samples/BindingTest/ViewModels/ExceptionErrorViewModel.cs b/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs
similarity index 100%
rename from samples/BindingTest/ViewModels/ExceptionErrorViewModel.cs
rename to samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs
diff --git a/samples/BindingTest/ViewModels/IndeiErrorViewModel.cs b/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs
similarity index 100%
rename from samples/BindingTest/ViewModels/IndeiErrorViewModel.cs
rename to samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs
diff --git a/samples/BindingTest/ViewModels/MainWindowViewModel.cs b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from samples/BindingTest/ViewModels/MainWindowViewModel.cs
rename to samples/BindingDemo/ViewModels/MainWindowViewModel.cs
diff --git a/samples/BindingTest/ViewModels/NestedCommandViewModel.cs b/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs
similarity index 100%
rename from samples/BindingTest/ViewModels/NestedCommandViewModel.cs
rename to samples/BindingDemo/ViewModels/NestedCommandViewModel.cs
diff --git a/samples/BindingTest/ViewModels/TestItem.cs b/samples/BindingDemo/ViewModels/TestItem.cs
similarity index 100%
rename from samples/BindingTest/ViewModels/TestItem.cs
rename to samples/BindingDemo/ViewModels/TestItem.cs
diff --git a/samples/RemoteTest/Program.cs b/samples/RemoteDemo/Program.cs
similarity index 100%
rename from samples/RemoteTest/Program.cs
rename to samples/RemoteDemo/Program.cs
diff --git a/samples/RemoteTest/RemoteTest.csproj b/samples/RemoteDemo/RemoteDemo.csproj
similarity index 100%
rename from samples/RemoteTest/RemoteTest.csproj
rename to samples/RemoteDemo/RemoteDemo.csproj
diff --git a/samples/RenderTest/App.config b/samples/RenderDemo/App.config
similarity index 100%
rename from samples/RenderTest/App.config
rename to samples/RenderDemo/App.config
diff --git a/samples/RenderTest/App.xaml b/samples/RenderDemo/App.xaml
similarity index 100%
rename from samples/RenderTest/App.xaml
rename to samples/RenderDemo/App.xaml
diff --git a/samples/RenderTest/App.xaml.cs b/samples/RenderDemo/App.xaml.cs
similarity index 100%
rename from samples/RenderTest/App.xaml.cs
rename to samples/RenderDemo/App.xaml.cs
diff --git a/samples/RenderTest/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
similarity index 100%
rename from samples/RenderTest/MainWindow.xaml
rename to samples/RenderDemo/MainWindow.xaml
diff --git a/samples/RenderTest/MainWindow.xaml.cs b/samples/RenderDemo/MainWindow.xaml.cs
similarity index 100%
rename from samples/RenderTest/MainWindow.xaml.cs
rename to samples/RenderDemo/MainWindow.xaml.cs
diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
similarity index 100%
rename from samples/RenderTest/Pages/AnimationsPage.xaml
rename to samples/RenderDemo/Pages/AnimationsPage.xaml
diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml.cs b/samples/RenderDemo/Pages/AnimationsPage.xaml.cs
similarity index 100%
rename from samples/RenderTest/Pages/AnimationsPage.xaml.cs
rename to samples/RenderDemo/Pages/AnimationsPage.xaml.cs
diff --git a/samples/RenderTest/Pages/ClippingPage.xaml b/samples/RenderDemo/Pages/ClippingPage.xaml
similarity index 100%
rename from samples/RenderTest/Pages/ClippingPage.xaml
rename to samples/RenderDemo/Pages/ClippingPage.xaml
diff --git a/samples/RenderTest/Pages/ClippingPage.xaml.cs b/samples/RenderDemo/Pages/ClippingPage.xaml.cs
similarity index 100%
rename from samples/RenderTest/Pages/ClippingPage.xaml.cs
rename to samples/RenderDemo/Pages/ClippingPage.xaml.cs
diff --git a/samples/RenderTest/Pages/DrawingPage.xaml b/samples/RenderDemo/Pages/DrawingPage.xaml
similarity index 100%
rename from samples/RenderTest/Pages/DrawingPage.xaml
rename to samples/RenderDemo/Pages/DrawingPage.xaml
diff --git a/samples/RenderTest/Pages/DrawingPage.xaml.cs b/samples/RenderDemo/Pages/DrawingPage.xaml.cs
similarity index 100%
rename from samples/RenderTest/Pages/DrawingPage.xaml.cs
rename to samples/RenderDemo/Pages/DrawingPage.xaml.cs
diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderDemo/RenderDemo.csproj
similarity index 100%
rename from samples/RenderTest/RenderTest.csproj
rename to samples/RenderDemo/RenderDemo.csproj
diff --git a/samples/RenderTest/SideBar.xaml b/samples/RenderDemo/SideBar.xaml
similarity index 100%
rename from samples/RenderTest/SideBar.xaml
rename to samples/RenderDemo/SideBar.xaml
diff --git a/samples/RenderTest/ViewModels/AnimationsPageViewModel.cs b/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs
similarity index 100%
rename from samples/RenderTest/ViewModels/AnimationsPageViewModel.cs
rename to samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs
diff --git a/samples/RenderTest/ViewModels/MainWindowViewModel.cs b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from samples/RenderTest/ViewModels/MainWindowViewModel.cs
rename to samples/RenderDemo/ViewModels/MainWindowViewModel.cs
diff --git a/samples/VirtualizationTest/App.config b/samples/VirtualizationDemo/App.config
similarity index 100%
rename from samples/VirtualizationTest/App.config
rename to samples/VirtualizationDemo/App.config
diff --git a/samples/VirtualizationTest/App.xaml b/samples/VirtualizationDemo/App.xaml
similarity index 100%
rename from samples/VirtualizationTest/App.xaml
rename to samples/VirtualizationDemo/App.xaml
diff --git a/samples/VirtualizationTest/App.xaml.cs b/samples/VirtualizationDemo/App.xaml.cs
similarity index 100%
rename from samples/VirtualizationTest/App.xaml.cs
rename to samples/VirtualizationDemo/App.xaml.cs
diff --git a/samples/VirtualizationTest/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml
similarity index 100%
rename from samples/VirtualizationTest/MainWindow.xaml
rename to samples/VirtualizationDemo/MainWindow.xaml
diff --git a/samples/VirtualizationTest/MainWindow.xaml.cs b/samples/VirtualizationDemo/MainWindow.xaml.cs
similarity index 100%
rename from samples/VirtualizationTest/MainWindow.xaml.cs
rename to samples/VirtualizationDemo/MainWindow.xaml.cs
diff --git a/samples/VirtualizationTest/Program.cs b/samples/VirtualizationDemo/Program.cs
similarity index 100%
rename from samples/VirtualizationTest/Program.cs
rename to samples/VirtualizationDemo/Program.cs
diff --git a/samples/VirtualizationTest/ViewModels/ItemViewModel.cs b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs
similarity index 100%
rename from samples/VirtualizationTest/ViewModels/ItemViewModel.cs
rename to samples/VirtualizationDemo/ViewModels/ItemViewModel.cs
diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
rename to samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
similarity index 100%
rename from samples/VirtualizationTest/VirtualizationTest.csproj
rename to samples/VirtualizationDemo/VirtualizationDemo.csproj