From 203e1c8f9ee204e57e40d6e5892f42068622622d Mon Sep 17 00:00:00 2001
From: Vladimir Morozov <vmorozov@microsoft.com>
Date: Wed, 18 Dec 2019 13:45:40 -0800
Subject: [PATCH] Make sure that C# and C++ SampleApp projects identifiers have
 proper CS and Cpp suffixes to avoid name collisions.

---
 .../index.windows.js                          | 78 +++++++++----------
 .../windows/SampleAppCPP/App.cpp              |  8 +-
 .../windows/SampleAppCPP/App.h                |  4 +-
 .../windows/SampleAppCPP/App.idl              |  3 +-
 .../windows/SampleAppCPP/App.xaml             |  4 +-
 .../windows/SampleAppCPP/DebugConsole.h       |  5 +-
 .../windows/SampleAppCPP/Package.appxmanifest |  6 +-
 .../SampleAppCPP/ReactPackageProvider.cpp     |  4 +-
 .../SampleAppCPP/ReactPackageProvider.h       |  4 +-
 .../windows/SampleAppCPP/pch.h                |  2 +-
 .../windows/SampleAppCS/App.xaml              |  4 +-
 .../windows/SampleAppCS/App.xaml.cs           |  4 +-
 .../windows/SampleAppCS/DebugConsole.cs       |  2 +-
 .../windows/SampleAppCS/Package.appxmanifest  |  2 +-
 .../SampleAppCS/Properties/AssemblyInfo.cs    |  4 +-
 .../windows/SampleAppCS/SampleAppCS.csproj    |  8 +-
 .../SampleAppCpp.vcxproj}                     |  6 +-
 .../SampleAppCpp.vcxproj.filters}             |  0
 .../windows/SampleApps.sln                    |  4 +-
 .../SampleLibraryCPP/CircleViewManagerCPP.cpp | 22 +++---
 .../SampleLibraryCPP/CircleViewManagerCPP.h   | 10 +--
 .../SampleLibraryCPP/CustomUserControlCPP.cpp | 22 +++---
 .../SampleLibraryCPP/CustomUserControlCPP.h   | 16 ++--
 .../SampleLibraryCPP/CustomUserControlCPP.idl |  8 +-
 .../CustomUserControlViewManagerCPP.cpp       | 46 +++++------
 .../CustomUserControlViewManagerCPP.h         | 10 +--
 .../windows/SampleLibraryCPP/DebugHelpers.cpp |  4 +-
 .../windows/SampleLibraryCPP/DebugHelpers.h   |  4 +-
 .../SampleLibraryCPP/ReactPackageProvider.cpp | 18 ++---
 .../SampleLibraryCPP/ReactPackageProvider.h   |  8 +-
 .../SampleLibraryCPP/ReactPackageProvider.idl |  2 +-
 .../SampleLibraryCPP/SampleLibraryCPP.vcxproj | 28 +++----
 .../SampleLibraryCPP.vcxproj.filters          | 18 ++---
 .../SampleLibraryCPP/SampleModuleCPP.h        | 16 ++--
 .../SampleLibraryCPP/Themes/Generic.xaml      |  6 +-
 .../windows/SampleLibraryCPP/readme.txt       |  2 +-
 36 files changed, 195 insertions(+), 197 deletions(-)
 rename packages/microsoft-reactnative-sampleapps/windows/{SampleAppCPP/SampleApp.vcxproj => SampleAppCpp/SampleAppCpp.vcxproj} (98%)
 rename packages/microsoft-reactnative-sampleapps/windows/{SampleAppCPP/SampleApp.vcxproj.filters => SampleAppCpp/SampleAppCpp.vcxproj.filters} (100%)

diff --git a/packages/microsoft-reactnative-sampleapps/index.windows.js b/packages/microsoft-reactnative-sampleapps/index.windows.js
index cafab488a58..92b844145b7 100644
--- a/packages/microsoft-reactnative-sampleapps/index.windows.js
+++ b/packages/microsoft-reactnative-sampleapps/index.windows.js
@@ -19,13 +19,13 @@ import { NativeModules, NativeEventEmitter } from 'react-native';
 
 // Creating event emitters
 const SampleModuleCSEmitter = new NativeEventEmitter(NativeModules.SampleModuleCS);
-const SampleModuleCPPEmitter = new NativeEventEmitter(NativeModules.SampleModuleCPP);
+const SampleModuleCppEmitter = new NativeEventEmitter(NativeModules.SampleModuleCpp);
 
 const CustomUserControlCS = requireNativeComponent('CustomUserControlCS');
-const CustomUserControlCPP = requireNativeComponent('CustomUserControlCPP');
+const CustomUserControlCpp = requireNativeComponent('CustomUserControlCpp');
 
 const CircleCS = requireNativeComponent('CircleCS');
-const CircleCPP = requireNativeComponent('CircleCPP');
+const CircleCpp = requireNativeComponent('CircleCpp');
 
 var log = function(result) {
   console.log(result);
@@ -47,12 +47,12 @@ var getErrorCallback = function(prefix) {
 class SampleApp extends Component {
   componentDidMount() {
     this._TimedEventCSSub = SampleModuleCSEmitter.addListener('TimedEventCS', getCallback('SampleModuleCS.TimedEventCS() => '));
-    this._TimedEventCPPSub = SampleModuleCPPEmitter.addListener('TimedEventCPP', getCallback('SampleModuleCPP.TimedEventCPP() => '));
+    this._TimedEventCppSub = SampleModuleCppEmitter.addListener('TimedEventCpp', getCallback('SampleModuleCpp.TimedEventCpp() => '));
   }
 
   componentWillUnmount() {
     this._TimedEventCSSub.remove();
-    this._TimedEventCPPSub.remove();
+    this._TimedEventCppSub.remove();
   }
 
   onPressSampleModuleCS() {
@@ -93,42 +93,42 @@ class SampleApp extends Component {
     log('SampleModuleCS.SyncReturnMethodWithArgs => ' + NativeModules.SampleModuleCS.SyncReturnMethodWithArgs(numberArg));
   }
 
-  onPressSampleModuleCPP() {
-    log('SampleApp.onPressSampleModuleCPP()');
+  onPressSampleModuleCpp() {
+    log('SampleApp.onPressSampleModuleCpp()');
 
     var numberArg = 42;
 
-    // SampleModuleCPP constants
+    // SampleModuleCpp constants
 
-    log(`SampleModuleCPP.NumberConstant: ${NativeModules.SampleModuleCPP.NumberConstant}`);
-    log(`SampleModuleCPP.StringConstant: ${NativeModules.SampleModuleCPP.StringConstant}`);
+    log(`SampleModuleCpp.NumberConstant: ${NativeModules.SampleModuleCpp.NumberConstant}`);
+    log(`SampleModuleCpp.StringConstant: ${NativeModules.SampleModuleCpp.StringConstant}`);
 
-    log(`SampleModuleCPP.NumberConstantViaProvider: ${NativeModules.SampleModuleCPP.NumberConstantViaProvider}`);
-    log(`SampleModuleCPP.StringConstantViaProvider: ${NativeModules.SampleModuleCPP.StringConstantViaProvider}`);
+    log(`SampleModuleCpp.NumberConstantViaProvider: ${NativeModules.SampleModuleCpp.NumberConstantViaProvider}`);
+    log(`SampleModuleCpp.StringConstantViaProvider: ${NativeModules.SampleModuleCpp.StringConstantViaProvider}`);
 
-    // SampleModuleCPP method calls
+    // SampleModuleCpp method calls
 
-    NativeModules.SampleModuleCPP.VoidMethod();
+    NativeModules.SampleModuleCpp.VoidMethod();
 
-    NativeModules.SampleModuleCPP.VoidMethodWithArgs(numberArg);
+    NativeModules.SampleModuleCpp.VoidMethodWithArgs(numberArg);
 
-    NativeModules.SampleModuleCPP.ReturnMethod(getCallback('SampleModuleCPP.ReturnMethod => '));
+    NativeModules.SampleModuleCpp.ReturnMethod(getCallback('SampleModuleCpp.ReturnMethod => '));
 
-    NativeModules.SampleModuleCPP.ReturnMethodWithArgs(numberArg, getCallback('SampleModuleCPP.ReturnMethodWithArgs => '));
+    NativeModules.SampleModuleCpp.ReturnMethodWithArgs(numberArg, getCallback('SampleModuleCpp.ReturnMethodWithArgs => '));
 
-    NativeModules.SampleModuleCPP.ExplicitCallbackMethod(getCallback('SampleModuleCPP.ExplicitCallbackMethod => '));
+    NativeModules.SampleModuleCpp.ExplicitCallbackMethod(getCallback('SampleModuleCpp.ExplicitCallbackMethod => '));
 
-    NativeModules.SampleModuleCPP.ExplicitCallbackMethodWithArgs(numberArg, getCallback('SampleModuleCPP.ExplicitCallbackMethodWithArgs => '));
+    NativeModules.SampleModuleCpp.ExplicitCallbackMethodWithArgs(numberArg, getCallback('SampleModuleCpp.ExplicitCallbackMethodWithArgs => '));
 
-    var promise1 = NativeModules.SampleModuleCPP.ExplicitPromiseMethod();
-    promise1.then(getCallback('SampleModuleCPP.ExplicitPromiseMethod then => ')).catch(getErrorCallback('SampleModuleCPP.ExplicitPromiseMethod catch => '));
+    var promise1 = NativeModules.SampleModuleCpp.ExplicitPromiseMethod();
+    promise1.then(getCallback('SampleModuleCpp.ExplicitPromiseMethod then => ')).catch(getErrorCallback('SampleModuleCpp.ExplicitPromiseMethod catch => '));
 
-    var promise2 = NativeModules.SampleModuleCPP.ExplicitPromiseMethodWithArgs(numberArg);
-    promise2.then(getCallback('SampleModuleCPP.ExplicitPromiseMethodWithArgs then => ')).catch(getErrorCallback('SampleModuleCPP.ExplicitPromiseMethodWithArgs catch => '));
+    var promise2 = NativeModules.SampleModuleCpp.ExplicitPromiseMethodWithArgs(numberArg);
+    promise2.then(getCallback('SampleModuleCpp.ExplicitPromiseMethodWithArgs then => ')).catch(getErrorCallback('SampleModuleCpp.ExplicitPromiseMethodWithArgs catch => '));
 
-    log('SampleModuleCPP.SyncReturnMethod => ' + NativeModules.SampleModuleCPP.SyncReturnMethod());
+    log('SampleModuleCpp.SyncReturnMethod => ' + NativeModules.SampleModuleCpp.SyncReturnMethod());
 
-    log('SampleModuleCPP.SyncReturnMethodWithArgs => ' + NativeModules.SampleModuleCPP.SyncReturnMethodWithArgs(numberArg));
+    log('SampleModuleCpp.SyncReturnMethodWithArgs => ' + NativeModules.SampleModuleCpp.SyncReturnMethodWithArgs(numberArg));
   }
 
   onPressCustomUserControlCS() {
@@ -144,16 +144,16 @@ class SampleApp extends Component {
     }
   }
 
-  onPressCustomUserControlCPP() {
-    log('SampleApp.onPressCustomUserControlCPP()');
+  onPressCustomUserControlCpp() {
+    log('SampleApp.onPressCustomUserControlCpp()');
 
     var strArg = 'Hello World!';
 
-    if (this._CustomUserControlCPPRef)
+    if (this._CustomUserControlCppRef)
     {
-      const tag = findNodeHandle(this._CustomUserControlCPPRef);
-      log(`UIManager.dispatchViewManagerCommand(${tag}, CustomUserControlCPP.CustomCommand, "${strArg}")`);
-      UIManager.dispatchViewManagerCommand(tag, UIManager.getViewManagerConfig('CustomUserControlCPP').Commands.CustomCommand, strArg);
+      const tag = findNodeHandle(this._CustomUserControlCppRef);
+      log(`UIManager.dispatchViewManagerCommand(${tag}, CustomUserControlCpp.CustomCommand, "${strArg}")`);
+      UIManager.dispatchViewManagerCommand(tag, UIManager.getViewManagerConfig('CustomUserControlCpp').Commands.CustomCommand, strArg);
     }
   }
 
@@ -162,9 +162,9 @@ class SampleApp extends Component {
     log(`SampleApp.onLabelChangedCustomUserControlCS("${label}")`);
   }
 
-  onLabelChangedCustomUserControlCPP(evt) {
+  onLabelChangedCustomUserControlCpp(evt) {
     var label = evt.nativeEvent;
-    log(`SampleApp.onLabelChangedCustomUserControlCPP("${label}")`);
+    log(`SampleApp.onLabelChangedCustomUserControlCpp("${label}")`);
   }
 
   render() {
@@ -178,13 +178,13 @@ class SampleApp extends Component {
         </Text>
 
         <Button onPress={() => { this.onPressSampleModuleCS(); }} title="Call SampleModuleCS!" disabled={NativeModules.SampleModuleCS == null} />
-        <Button onPress={() => { this.onPressSampleModuleCPP(); }} title="Call SampleModuleCPP!" disabled={NativeModules.SampleModuleCPP == null} />
+        <Button onPress={() => { this.onPressSampleModuleCpp(); }} title="Call SampleModuleCpp!" disabled={NativeModules.SampleModuleCpp == null} />
 
         <CustomUserControlCS style={styles.customcontrol} label="CustomUserControlCS!" ref={(ref) => { this._CustomUserControlCSRef = ref; }} onLabelChanged={(evt) => { this.onLabelChangedCustomUserControlCS(evt); }} />
         <Button onPress={() => { this.onPressCustomUserControlCS(); }} title="Call CustomUserControlCS Commands!" />
 
-        <CustomUserControlCPP style={styles.customcontrol} label="CustomUserControlCPP!" ref={(ref) => { this._CustomUserControlCPPRef = ref; }} onLabelChanged={(evt) => { this.onLabelChangedCustomUserControlCPP(evt); }} />
-        <Button onPress={() => { this.onPressCustomUserControlCPP(); }} title="Call CustomUserControlCPP Commands!" />
+        <CustomUserControlCpp style={styles.customcontrol} label="CustomUserControlCpp!" ref={(ref) => { this._CustomUserControlCppRef = ref; }} onLabelChanged={(evt) => { this.onLabelChangedCustomUserControlCpp(evt); }} />
+        <Button onPress={() => { this.onPressCustomUserControlCpp(); }} title="Call CustomUserControlCpp Commands!" />
 
         <CircleCS style={styles.circle}>
           <View style={styles.box}>
@@ -192,11 +192,11 @@ class SampleApp extends Component {
           </View>
         </CircleCS>
 
-        <CircleCPP style={styles.circle}>
+        <CircleCpp style={styles.circle}>
           <View style={styles.box}>
-            <Text style={styles.boxText}>CircleCPP!</Text>
+            <Text style={styles.boxText}>CircleCpp!</Text>
           </View>
-        </CircleCPP>
+        </CircleCpp>
         <Text style={styles.instructions}>
           Hello from Microsoft!
         </Text>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp
index bb689540ef4..821816a18b3 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.cpp
@@ -5,10 +5,10 @@
 
 #include "App.h"
 #include "ReactPackageProvider.h"
-#include "winrt/SampleLibraryCPP.h"
 #include "winrt/SampleLibraryCS.h"
+#include "winrt/SampleLibraryCpp.h"
 
-namespace winrt::SampleApp::implementation {
+namespace winrt::SampleAppCpp::implementation {
 
 /// <summary>
 /// Initializes the singleton application object.  This is the first line of
@@ -36,7 +36,7 @@ App::App() noexcept {
 #endif
 
   PackageProviders().Append(make<ReactPackageProvider>()); // Includes all modules in this project
-  PackageProviders().Append(winrt::SampleLibraryCPP::ReactPackageProvider());
+  PackageProviders().Append(winrt::SampleLibraryCpp::ReactPackageProvider());
   PackageProviders().Append(winrt::SampleLibraryCS::ReactPackageProvider());
 
   InitializeComponent();
@@ -47,4 +47,4 @@ App::App() noexcept {
   m_inner.as<::IUnknown>()->Release();
 }
 
-} // namespace winrt::SampleApp::implementation
+} // namespace winrt::SampleAppCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.h b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.h
index 9caf8d1499c..94022dcc91d 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.h
@@ -4,10 +4,10 @@
 
 #include "App.xaml.g.h"
 
-namespace winrt::SampleApp::implementation {
+namespace winrt::SampleAppCpp::implementation {
 
 struct App : AppT<App> {
   App() noexcept;
 };
 
-} // namespace winrt::SampleApp::implementation
+} // namespace winrt::SampleAppCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.idl b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.idl
index ab4d326d3cf..011a8fb1105 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.idl
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.idl
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace SampleApp
-{
+namespace SampleAppCpp {
 }
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.xaml b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.xaml
index 80fecab641c..d60e41221c2 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.xaml
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/App.xaml
@@ -1,10 +1,10 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License.  -->
 <react:ReactApplication
-    x:Class="SampleApp.App"
+    x:Class="SampleAppCpp.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SampleApp"
+    xmlns:local="using:SampleAppCpp"
     xmlns:react="using:Microsoft.ReactNative">
 
 </react:ReactApplication>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/DebugConsole.h b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/DebugConsole.h
index f4231c71f56..3259050869f 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/DebugConsole.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/DebugConsole.h
@@ -3,10 +3,9 @@
 
 #pragma once
 
-#include <functional>
 #include "NativeModules.h"
 
-namespace SampleApp {
+namespace SampleAppCpp {
 
 REACT_MODULE(DebugConsole);
 struct DebugConsole {
@@ -17,4 +16,4 @@ struct DebugConsole {
   }
 };
 
-} // namespace SampleApp
+} // namespace SampleAppCpp
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/Package.appxmanifest b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/Package.appxmanifest
index 2cf8be29a01..77a1b0be94e 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/Package.appxmanifest
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/Package.appxmanifest
@@ -6,7 +6,7 @@
     Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="f7f3bd52-47fc-4b10-820c-d21716a92eff" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
   <Properties>
-    <DisplayName>SampleAppCPP</DisplayName>
+    <DisplayName>SampleAppCpp</DisplayName>
     <PublisherDisplayName>Microsoft</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -17,8 +17,8 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SampleApp.App">
-      <uap:VisualElements DisplayName="SampleAppCPP" Description="Project for a basic C++ React Native app based on the C++ implementation."
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SampleAppCpp.App">
+      <uap:VisualElements DisplayName="SampleAppCpp" Description="Project for a basic C++ React Native app based on the C++ implementation."
         Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
         </uap:DefaultTile>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp
index e6dd0f47b3c..b6ea457b286 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp
@@ -8,7 +8,7 @@
 
 using namespace winrt::Microsoft::ReactNative::Bridge;
 
-namespace winrt::SampleApp::implementation {
+namespace winrt::SampleAppCpp::implementation {
 
 //===========================================================================
 // ReactPackageProvider implementation
@@ -18,4 +18,4 @@ void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuil
   AddAttributedModules(packageBuilder);
 }
 
-} // namespace winrt::SampleApp::implementation
+} // namespace winrt::SampleAppCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.h b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.h
index a93a639db94..3e24d9aa5d2 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.h
@@ -6,11 +6,11 @@
 
 using namespace winrt::Microsoft::ReactNative::Bridge;
 
-namespace winrt::SampleApp::implementation {
+namespace winrt::SampleAppCpp::implementation {
 
 struct ReactPackageProvider : winrt::implements<ReactPackageProvider, IReactPackageProvider> {
  public: // IReactPackageProvider
   void CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept;
 };
 
-} // namespace winrt::SampleApp::implementation
+} // namespace winrt::SampleAppCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/pch.h b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/pch.h
index 1a79c7b1215..f52c438967d 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/pch.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/pch.h
@@ -21,7 +21,7 @@
 #include <winrt/Microsoft.ReactNative.Bridge.h>
 #include <winrt/Microsoft.ReactNative.h>
 
-#include <winrt/SampleLibraryCPP.h>
+#include <winrt/SampleLibraryCpp.h>
 
 #include <winrt/SampleLibraryCS.SampleLibraryCS_XamlTypeInfo.h>
 #include <winrt/SampleLibraryCS.h>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml
index 248a25dcb60..d5b1b0ca905 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml
@@ -1,10 +1,10 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
 <react:ReactApplication
-    x:Class="SampleApp.App"
+    x:Class="SampleAppCS.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SampleApp"
+    xmlns:local="using:SampleAppCS"
     xmlns:react="using:Microsoft.ReactNative">
 
 </react:ReactApplication>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml.cs b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml.cs
index 2a515aeb523..a2e2d9f6472 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml.cs
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/App.xaml.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.ReactNative;
 
-namespace SampleApp
+namespace SampleAppCS
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default
@@ -38,7 +38,7 @@ public App()
 
             PackageProviders.Add(new Microsoft.ReactNative.Managed.ReactPackageProvider()); // Includes any modules in this project
             PackageProviders.Add(new SampleLibraryCS.ReactPackageProvider());
-            PackageProviders.Add(new SampleLibraryCPP.ReactPackageProvider());
+            PackageProviders.Add(new SampleLibraryCpp.ReactPackageProvider());
 
             InitializeComponent();
         }
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/DebugConsole.cs b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/DebugConsole.cs
index c6a218aee6d..b1d69e9ceae 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/DebugConsole.cs
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/DebugConsole.cs
@@ -4,7 +4,7 @@
 using Microsoft.ReactNative.Managed;
 using System.Diagnostics;
 
-namespace SampleApp
+namespace SampleAppCS
 {
     [ReactModule]
     class DebugConsole
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Package.appxmanifest b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Package.appxmanifest
index 781b77c4d17..d62e998d04d 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Package.appxmanifest
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Package.appxmanifest
@@ -14,7 +14,7 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SampleApp.App">
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SampleAppCS.App">
       <uap:VisualElements DisplayName="SampleAppCS" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Project for a basic C# React Native app based on the C++ implementation." BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
         </uap:DefaultTile>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Properties/AssemblyInfo.cs b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Properties/AssemblyInfo.cs
index 35ea069bb7c..622cda690dd 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Properties/AssemblyInfo.cs
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SampleApp")]
+[assembly: AssemblyTitle("SampleAppCS")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SampleApp")]
+[assembly: AssemblyProduct("SampleAppCS")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
index 38bdb65d840..f7102265458 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{09F4E6C1-2D12-4059-AA96-0B190861FD6A}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SampleApp</RootNamespace>
-    <AssemblyName>SampleApp</AssemblyName>
+    <RootNamespace>SampleAppCS</RootNamespace>
+    <AssemblyName>SampleAppCS</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
@@ -157,9 +157,9 @@
       <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
       <Name>Microsoft.ReactNative</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SampleLibraryCPP\SampleLibraryCPP.vcxproj">
+    <ProjectReference Include="..\SampleLibraryCpp\SampleLibraryCpp.vcxproj">
       <Project>{47eec7f3-40d3-49ba-82c1-eaf103b54215}</Project>
-      <Name>SampleLibraryCPP</Name>
+      <Name>SampleLibraryCpp</Name>
     </ProjectReference>
     <ProjectReference Include="..\SampleLibraryCS\SampleLibraryCS.csproj">
       <Project>{c0a6bd9c-3ee5-4b12-8ce4-cee95178539c}</Project>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCpp/SampleAppCpp.vcxproj
similarity index 98%
rename from packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj
rename to packages/microsoft-reactnative-sampleapps/windows/SampleAppCpp/SampleAppCpp.vcxproj
index a25a7a1804d..d4262159b04 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCpp/SampleAppCpp.vcxproj
@@ -6,8 +6,8 @@
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <MinimalCoreWin>true</MinimalCoreWin>
     <ProjectGuid>{93f7572c-64b9-4096-9ef9-6ba0ede2b50d}</ProjectGuid>
-    <ProjectName>SampleAppCPP</ProjectName>
-    <RootNamespace>SampleApp</RootNamespace>
+    <ProjectName>SampleAppCpp</ProjectName>
+    <RootNamespace>SampleAppCpp</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -160,7 +160,7 @@
     <ProjectReference Include="$(ReactNativeWindowsDir)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
       <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\SampleLibraryCPP\SampleLibraryCPP.vcxproj">
+    <ProjectReference Include="..\SampleLibraryCpp\SampleLibraryCpp.vcxproj">
       <Project>{47eec7f3-40d3-49ba-82c1-eaf103b54215}</Project>
     </ProjectReference>
     <ProjectReference Include="..\SampleLibraryCS\SampleLibraryCS.csproj">
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj.filters b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCpp/SampleAppCpp.vcxproj.filters
similarity index 100%
rename from packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj.filters
rename to packages/microsoft-reactnative-sampleapps/windows/SampleAppCpp/SampleAppCpp.vcxproj.filters
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
index bdef09722ff..bf34b421fea 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
@@ -4,7 +4,7 @@ VisualStudioVersion = 16.0.29215.179
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleAppCS", "SampleAppCS\SampleAppCS.csproj", "{09F4E6C1-2D12-4059-AA96-0B190861FD6A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleAppCPP", "SampleAppCPP\SampleApp.vcxproj", "{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleAppCpp", "SampleAppCpp\SampleAppCpp.vcxproj", "{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
 	EndProjectSection
@@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleLibraryCS", "SampleLibraryCS\SampleLibraryCS.csproj", "{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleLibraryCPP", "SampleLibraryCPP\SampleLibraryCPP.vcxproj", "{47EEC7F3-40D3-49BA-82C1-EAF103B54215}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleLibraryCpp", "SampleLibraryCpp\SampleLibraryCpp.vcxproj", "{47EEC7F3-40D3-49BA-82C1-EAF103B54215}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Shared", "..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems", "{0CC28589-39E4-4288-B162-97B959F8B843}"
 EndProject
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp
index fec7cfa9523..3151312c5d4 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CircleViewManagerCPP.h"
+#include "CircleViewManagerCpp.h"
 
 using namespace winrt;
 using namespace Microsoft::ReactNative::Bridge;
@@ -14,16 +14,16 @@ using namespace Windows::UI::Xaml;
 using namespace Windows::UI::Xaml::Controls;
 using namespace Windows::UI::Xaml::Data;
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
-CircleViewManagerCPP::CircleViewManagerCPP() {}
+CircleViewManagerCpp::CircleViewManagerCpp() {}
 
 // IViewManager
-hstring CircleViewManagerCPP::Name() noexcept {
-  return L"CircleCPP";
+hstring CircleViewManagerCpp::Name() noexcept {
+  return L"CircleCpp";
 }
 
-FrameworkElement CircleViewManagerCPP::CreateView() noexcept {
+FrameworkElement CircleViewManagerCpp::CreateView() noexcept {
   auto const &view = winrt::Windows::UI::Xaml::Controls::Border();
 
   auto const &binding = winrt::Windows::UI::Xaml::Data::Binding();
@@ -38,25 +38,25 @@ FrameworkElement CircleViewManagerCPP::CreateView() noexcept {
 
 // IViewManagerWithChildren
 
-void CircleViewManagerCPP::AddView(FrameworkElement const &parent, UIElement const &child, int64_t /*index*/) noexcept {
+void CircleViewManagerCpp::AddView(FrameworkElement const &parent, UIElement const &child, int64_t /*index*/) noexcept {
   if (auto const &border = parent.try_as<Border>()) {
     border.Child(child);
   }
 }
 
-void CircleViewManagerCPP::RemoveAllChildren(FrameworkElement const &parent) noexcept {
+void CircleViewManagerCpp::RemoveAllChildren(FrameworkElement const &parent) noexcept {
   if (auto const &border = parent.try_as<Border>()) {
     border.Child(nullptr);
   }
 }
 
-void CircleViewManagerCPP::RemoveChildAt(FrameworkElement const &parent, int64_t /*index*/) noexcept {
+void CircleViewManagerCpp::RemoveChildAt(FrameworkElement const &parent, int64_t /*index*/) noexcept {
   if (auto const &border = parent.try_as<Border>()) {
     border.Child(nullptr);
   }
 }
 
-void CircleViewManagerCPP::ReplaceChild(
+void CircleViewManagerCpp::ReplaceChild(
     FrameworkElement const &parent,
     UIElement const & /*oldChild*/,
     UIElement const &newChild) noexcept {
@@ -65,4 +65,4 @@ void CircleViewManagerCPP::ReplaceChild(
   }
 }
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h
index 12f2e12fbf6..a7e26089e9f 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h
@@ -5,14 +5,14 @@
 
 #include "winrt/Microsoft.ReactNative.Bridge.h"
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
-struct CircleViewManagerCPP : winrt::implements<
-                                  CircleViewManagerCPP,
+struct CircleViewManagerCpp : winrt::implements<
+                                  CircleViewManagerCpp,
                                   winrt::Microsoft::ReactNative::Bridge::IViewManager,
                                   winrt::Microsoft::ReactNative::Bridge::IViewManagerWithChildren> {
  public:
-  CircleViewManagerCPP();
+  CircleViewManagerCpp();
 
   // IViewManager
   winrt::hstring Name() noexcept;
@@ -68,4 +68,4 @@ struct HeightToCornerRadiusConverter
   // IValueConverter
 };
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.cpp
index 7b0d1a8d7e6..d253621c041 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.cpp
@@ -2,32 +2,32 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CustomUserControlCPP.h"
-#include "CustomUserControlCPP.g.cpp"
+#include "CustomUserControlCpp.h"
+#include "CustomUserControlCpp.g.cpp"
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
-Windows::UI::Xaml::DependencyProperty CustomUserControlCPP::m_labelProperty =
+Windows::UI::Xaml::DependencyProperty CustomUserControlCpp::m_labelProperty =
     Windows::UI::Xaml::DependencyProperty::Register(
         L"Label",
         winrt::xaml_typename<winrt::hstring>(),
-        winrt::xaml_typename<winrt::SampleLibraryCPP::CustomUserControlCPP>(),
+        winrt::xaml_typename<winrt::SampleLibraryCpp::CustomUserControlCpp>(),
         Windows::UI::Xaml::PropertyMetadata{winrt::box_value(winrt::hstring())});
 
-CustomUserControlCPP::CustomUserControlCPP() {
-  DefaultStyleKey(winrt::box_value(L"SampleLibraryCPP.CustomUserControlCPP"));
+CustomUserControlCpp::CustomUserControlCpp() {
+  DefaultStyleKey(winrt::box_value(L"SampleLibraryCpp.CustomUserControlCpp"));
 }
 
-Windows::UI::Xaml::DependencyProperty CustomUserControlCPP::LabelProperty() {
+Windows::UI::Xaml::DependencyProperty CustomUserControlCpp::LabelProperty() {
   return m_labelProperty;
 }
 
-hstring CustomUserControlCPP::Label() {
+hstring CustomUserControlCpp::Label() {
   return winrt::unbox_value<winrt::hstring>(GetValue(m_labelProperty));
 }
 
-void CustomUserControlCPP::Label(hstring const &value) {
+void CustomUserControlCpp::Label(hstring const &value) {
   SetValue(m_labelProperty, winrt::box_value(value));
 }
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.h
index 44944cc4122..1820a4e9609 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.h
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "CustomUserControlCPP.g.h"
+#include "CustomUserControlCpp.g.h"
 
-namespace winrt::SampleLibraryCPP::implementation {
-struct CustomUserControlCPP : CustomUserControlCPPT<CustomUserControlCPP> {
-  CustomUserControlCPP();
+namespace winrt::SampleLibraryCpp::implementation {
+struct CustomUserControlCpp : CustomUserControlCppT<CustomUserControlCpp> {
+  CustomUserControlCpp();
 
   static Windows::UI::Xaml::DependencyProperty LabelProperty();
 
@@ -20,8 +20,8 @@ struct CustomUserControlCPP : CustomUserControlCPPT<CustomUserControlCPP> {
  private:
   static Windows::UI::Xaml::DependencyProperty m_labelProperty;
 };
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
 
-namespace winrt::SampleLibraryCPP::factory_implementation {
-struct CustomUserControlCPP : CustomUserControlCPPT<CustomUserControlCPP, implementation::CustomUserControlCPP> {};
-} // namespace winrt::SampleLibraryCPP::factory_implementation
+namespace winrt::SampleLibraryCpp::factory_implementation {
+struct CustomUserControlCpp : CustomUserControlCppT<CustomUserControlCpp, implementation::CustomUserControlCpp> {};
+} // namespace winrt::SampleLibraryCpp::factory_implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.idl b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.idl
index 7d612be089b..013b669dd95 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.idl
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlCPP.idl
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace SampleLibraryCPP {
-runtimeclass CustomUserControlCPP : Windows.UI.Xaml.Controls.Control {
-  CustomUserControlCPP();
+namespace SampleLibraryCpp {
+runtimeclass CustomUserControlCpp : Windows.UI.Xaml.Controls.Control {
+  CustomUserControlCpp();
 
   static Windows.UI.Xaml.DependencyProperty LabelProperty {
     get;
   };
   String Label;
 }
-} // namespace SampleLibraryCPP
+} // namespace SampleLibraryCpp
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.cpp
index e738be9b459..7a40ea29927 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.cpp
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CustomUserControlViewManagerCPP.h"
+#include "CustomUserControlViewManagerCpp.h"
 
-#include "CustomUserControlCPP.h"
+#include "CustomUserControlCpp.h"
 #include "DebugHelpers.h"
 
 using namespace winrt;
@@ -16,28 +16,28 @@ using namespace Windows::UI::Xaml;
 using namespace Windows::UI::Xaml::Media;
 using namespace Windows::UI::Xaml::Controls;
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
-CustomUserControlViewManagerCPP::CustomUserControlViewManagerCPP(IReactContext const &reactContext)
+CustomUserControlViewManagerCpp::CustomUserControlViewManagerCpp(IReactContext const &reactContext)
     : m_reactContext{reactContext} {}
 
-IReactContext CustomUserControlViewManagerCPP::ReactContext() noexcept {
+IReactContext CustomUserControlViewManagerCpp::ReactContext() noexcept {
   return m_reactContext;
 }
 
 // IViewManager
-hstring CustomUserControlViewManagerCPP::Name() noexcept {
-  return L"CustomUserControlCPP";
+hstring CustomUserControlViewManagerCpp::Name() noexcept {
+  return L"CustomUserControlCpp";
 }
 
-FrameworkElement CustomUserControlViewManagerCPP::CreateView() noexcept {
-  auto const &view = winrt::SampleLibraryCPP::CustomUserControlCPP();
+FrameworkElement CustomUserControlViewManagerCpp::CreateView() noexcept {
+  auto const &view = winrt::SampleLibraryCpp::CustomUserControlCpp();
 
   view.RegisterPropertyChangedCallback(
-      winrt::SampleLibraryCPP::CustomUserControlCPP::LabelProperty(),
+      winrt::SampleLibraryCpp::CustomUserControlCpp::LabelProperty(),
       [this](
           winrt::Windows::UI::Xaml::DependencyObject obj, winrt::Windows::UI::Xaml::DependencyProperty prop) noexcept {
-        if (auto c = obj.try_as<winrt::SampleLibraryCPP::CustomUserControlCPP>()) {
+        if (auto c = obj.try_as<winrt::SampleLibraryCpp::CustomUserControlCpp>()) {
           ReactContext().DispatchEvent(c, L"topLabelChanged", box_value(c.Label()));
         }
       });
@@ -46,7 +46,7 @@ FrameworkElement CustomUserControlViewManagerCPP::CreateView() noexcept {
 }
 
 // IViewManagerWithNativeProperties
-IMapView<hstring, ViewManagerPropertyType> CustomUserControlViewManagerCPP::NativeProps() noexcept {
+IMapView<hstring, ViewManagerPropertyType> CustomUserControlViewManagerCpp::NativeProps() noexcept {
   auto nativeProps = winrt::single_threaded_map<hstring, ViewManagerPropertyType>();
 
   nativeProps.Insert(L"label", ViewManagerPropertyType::String);
@@ -56,10 +56,10 @@ IMapView<hstring, ViewManagerPropertyType> CustomUserControlViewManagerCPP::Nati
   return nativeProps.GetView();
 }
 
-void CustomUserControlViewManagerCPP::UpdateProperties(
+void CustomUserControlViewManagerCpp::UpdateProperties(
     FrameworkElement const &view,
     IMapView<hstring, IInspectable> const &propertyMap) {
-  if (auto control = view.try_as<winrt::SampleLibraryCPP::CustomUserControlCPP>()) {
+  if (auto control = view.try_as<winrt::SampleLibraryCpp::CustomUserControlCpp>()) {
     for (auto const &pair : propertyMap) {
       auto const &propertyName = pair.Key();
       auto const &propertyValue = pair.Value();
@@ -67,9 +67,9 @@ void CustomUserControlViewManagerCPP::UpdateProperties(
       if (propertyName == L"label") {
         if (propertyValue != nullptr) {
           auto value = winrt::unbox_value<hstring>(propertyValue);
-          control.SetValue(winrt::SampleLibraryCPP::CustomUserControlCPP::LabelProperty(), propertyValue);
+          control.SetValue(winrt::SampleLibraryCpp::CustomUserControlCpp::LabelProperty(), propertyValue);
         } else {
-          control.ClearValue(winrt::SampleLibraryCPP::CustomUserControlCPP::LabelProperty());
+          control.ClearValue(winrt::SampleLibraryCpp::CustomUserControlCpp::LabelProperty());
         }
       } else if (propertyName == L"color") {
         if (auto value = propertyValue.try_as<Brush>()) {
@@ -89,34 +89,34 @@ void CustomUserControlViewManagerCPP::UpdateProperties(
 }
 
 // IViewManagerWithCommands
-IMapView<hstring, int64_t> CustomUserControlViewManagerCPP::Commands() noexcept {
+IMapView<hstring, int64_t> CustomUserControlViewManagerCpp::Commands() noexcept {
   auto commands = winrt::single_threaded_map<hstring, int64_t>();
   commands.Insert(L"CustomCommand", 0);
   return commands.GetView();
 }
 
-void CustomUserControlViewManagerCPP::DispatchCommand(
+void CustomUserControlViewManagerCpp::DispatchCommand(
     FrameworkElement const &view,
     int64_t commandId,
     IVectorView<IInspectable> commandArgs) noexcept {
-  if (auto control = view.try_as<winrt::SampleLibraryCPP::CustomUserControlCPP>()) {
+  if (auto control = view.try_as<winrt::SampleLibraryCpp::CustomUserControlCpp>()) {
     if (commandId == 0) {
       std::string arg = std::to_string(winrt::unbox_value<int64_t>(view.Tag()));
       arg.append(", \"");
       arg.append(winrt::to_string(winrt::unbox_value<hstring>(commandArgs.GetAt(0))));
       arg.append("\"");
-      ::SampleLibraryCPP::DebugWriteLine(to_string(Name()), "CustomCommand", arg);
+      ::SampleLibraryCpp::DebugWriteLine(to_string(Name()), "CustomCommand", arg);
     }
   }
 }
 
 // IViewManagerWithExportedEventTypeConstants
-IMapView<hstring, IInspectable> CustomUserControlViewManagerCPP::ExportedCustomBubblingEventTypeConstants() noexcept {
+IMapView<hstring, IInspectable> CustomUserControlViewManagerCpp::ExportedCustomBubblingEventTypeConstants() noexcept {
   auto constants = winrt::single_threaded_map<hstring, IInspectable>();
   return constants.GetView();
 }
 
-IMapView<hstring, IInspectable> CustomUserControlViewManagerCPP::ExportedCustomDirectEventTypeConstants() noexcept {
+IMapView<hstring, IInspectable> CustomUserControlViewManagerCpp::ExportedCustomDirectEventTypeConstants() noexcept {
   auto constants = winrt::single_threaded_map<hstring, IInspectable>();
 
   auto registration = winrt::single_threaded_map<hstring, IInspectable>();
@@ -127,4 +127,4 @@ IMapView<hstring, IInspectable> CustomUserControlViewManagerCPP::ExportedCustomD
   return constants.GetView();
 }
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.h
index 461726439d4..af7b7795bfb 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CustomUserControlViewManagerCPP.h
@@ -5,17 +5,17 @@
 
 #include "winrt/Microsoft.ReactNative.Bridge.h"
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
-struct CustomUserControlViewManagerCPP
+struct CustomUserControlViewManagerCpp
     : winrt::implements<
-          CustomUserControlViewManagerCPP,
+          CustomUserControlViewManagerCpp,
           winrt::Microsoft::ReactNative::Bridge::IViewManager,
           winrt::Microsoft::ReactNative::Bridge::IViewManagerWithNativeProperties,
           winrt::Microsoft::ReactNative::Bridge::IViewManagerWithCommands,
           winrt::Microsoft::ReactNative::Bridge::IViewManagerWithExportedEventTypeConstants> {
  public:
-  CustomUserControlViewManagerCPP(winrt::Microsoft::ReactNative::Bridge::IReactContext const &reactContext);
+  CustomUserControlViewManagerCpp(winrt::Microsoft::ReactNative::Bridge::IReactContext const &reactContext);
 
   // IViewManager
   winrt::hstring Name() noexcept;
@@ -54,4 +54,4 @@ struct CustomUserControlViewManagerCPP
   winrt::Microsoft::ReactNative::Bridge::IReactContext m_reactContext{nullptr};
 };
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.cpp
index db4b384d186..8f03008765a 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "DebugHelpers.h"
 
-namespace SampleLibraryCPP {
+namespace SampleLibraryCpp {
 
 void DebugWriteLine(const std::string &name, const std::string &methodName, const std::string &arg) {
   std::string output = name + "::" + methodName + "(" + arg + ")\n";
@@ -19,4 +19,4 @@ void DebugWriteLine(const std::string &name, const std::string &methodName) {
   DebugWriteLine(name, methodName, "");
 }
 
-} // namespace SampleLibraryCPP
+} // namespace SampleLibraryCpp
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.h
index fa765fdd064..6e81c08601c 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/DebugHelpers.h
@@ -7,7 +7,7 @@
 
 #include <hstring.h>
 
-namespace SampleLibraryCPP {
+namespace SampleLibraryCpp {
 
 void DebugWriteLine(const std::string &name, const std::string &methodName, const std::string &arg);
 
@@ -15,4 +15,4 @@ void DebugWriteLine(const std::string &name, const std::string &methodName, doub
 
 void DebugWriteLine(const std::string &name, const std::string &methodName);
 
-} // namespace SampleLibraryCPP
+} // namespace SampleLibraryCpp
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp
index 58a46bec3c9..30e87a27d64 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp
@@ -7,22 +7,22 @@
 #include "ReactPackageProvider.g.cpp"
 #endif
 
-#include "CircleViewManagerCPP.h"
-#include "CustomUserControlViewManagerCPP.h"
-#include "SampleModuleCPP.h"
+#include "CircleViewManagerCpp.h"
+#include "CustomUserControlViewManagerCpp.h"
+#include "SampleModuleCpp.h"
 
 using namespace winrt::Microsoft::ReactNative::Bridge;
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
 void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept {
   AddAttributedModules(packageBuilder);
-  packageBuilder.AddViewManager(L"CustomUserControlViewManagerCPP", [](IReactContext const &reactContext) {
-    return winrt::make<CustomUserControlViewManagerCPP>(reactContext);
+  packageBuilder.AddViewManager(L"CustomUserControlViewManagerCpp", [](IReactContext const &reactContext) {
+    return winrt::make<CustomUserControlViewManagerCpp>(reactContext);
   });
-  packageBuilder.AddViewManager(L"CircleViewManagerCPP", [](IReactContext const & /*reactContext*/) {
-    return winrt::make<CircleViewManagerCPP>();
+  packageBuilder.AddViewManager(L"CircleViewManagerCpp", [](IReactContext const & /*reactContext*/) {
+    return winrt::make<CircleViewManagerCpp>();
   });
 }
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.h
index f95765f7088..5d216819d6d 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.h
@@ -6,7 +6,7 @@
 
 using namespace winrt::Microsoft::ReactNative::Bridge;
 
-namespace winrt::SampleLibraryCPP::implementation {
+namespace winrt::SampleLibraryCpp::implementation {
 
 struct ReactPackageProvider : ReactPackageProviderT<ReactPackageProvider> {
   ReactPackageProvider() = default;
@@ -14,10 +14,10 @@ struct ReactPackageProvider : ReactPackageProviderT<ReactPackageProvider> {
   void CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept;
 };
 
-} // namespace winrt::SampleLibraryCPP::implementation
+} // namespace winrt::SampleLibraryCpp::implementation
 
-namespace winrt::SampleLibraryCPP::factory_implementation {
+namespace winrt::SampleLibraryCpp::factory_implementation {
 
 struct ReactPackageProvider : ReactPackageProviderT<ReactPackageProvider, implementation::ReactPackageProvider> {};
 
-} // namespace winrt::SampleLibraryCPP::factory_implementation
+} // namespace winrt::SampleLibraryCpp::factory_implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.idl b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.idl
index e0df7e57045..fcf80d86636 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.idl
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace SampleLibraryCPP
+namespace SampleLibraryCpp
 {
     [webhosthidden]
     [default_interface]
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
index fa6314550c2..774a285e6c4 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
@@ -6,8 +6,8 @@
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <MinimalCoreWin>true</MinimalCoreWin>
     <ProjectGuid>{47eec7f3-40d3-49ba-82c1-eaf103b54215}</ProjectGuid>
-    <ProjectName>SampleLibraryCPP</ProjectName>
-    <RootNamespace>SampleLibraryCPP</RootNamespace>
+    <ProjectName>SampleLibraryCpp</ProjectName>
+    <RootNamespace>SampleLibraryCpp</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -90,7 +90,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
-      <ModuleDefinitionFile>SampleLibraryCPP.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>SampleLibraryCpp.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -104,24 +104,24 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="CustomUserControlCPP.h">
-      <DependentUpon>CustomUserControlCPP.idl</DependentUpon>
+    <ClInclude Include="CustomUserControlCpp.h">
+      <DependentUpon>CustomUserControlCpp.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="CustomUserControlViewManagerCPP.h" />
-    <ClInclude Include="CircleViewManagerCPP.h" />
+    <ClInclude Include="CustomUserControlViewManagerCpp.h" />
+    <ClInclude Include="CircleViewManagerCpp.h" />
     <ClInclude Include="DebugHelpers.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ReactPackageProvider.h">
       <DependentUpon>ReactPackageProvider.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="SampleModuleCPP.h" />
+    <ClInclude Include="SampleModuleCpp.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CustomUserControlCPP.cpp">
-      <DependentUpon>CustomUserControlCPP.idl</DependentUpon>
+    <ClCompile Include="CustomUserControlCpp.cpp">
+      <DependentUpon>CustomUserControlCpp.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="CustomUserControlViewManagerCPP.cpp" />
-    <ClCompile Include="CircleViewManagerCPP.cpp" />
+    <ClCompile Include="CustomUserControlViewManagerCpp.cpp" />
+    <ClCompile Include="CircleViewManagerCpp.cpp" />
     <ClCompile Include="DebugHelpers.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -132,12 +132,12 @@
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Midl Include="CustomUserControlCPP.idl" />
+    <Midl Include="CustomUserControlCpp.idl" />
     <Midl Include="ReactPackageProvider.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="SampleLibraryCPP.def" />
+    <None Include="SampleLibraryCpp.def" />
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters
index 69b9b8dba83..d01e69d0559 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters
@@ -16,22 +16,22 @@
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="ReactPackageProvider.cpp" />
-    <ClCompile Include="CustomUserControlCPP.cpp" />
-    <ClCompile Include="CustomUserControlViewManagerCPP.cpp" />
-    <ClCompile Include="CircleViewManagerCPP.cpp" />
+    <ClCompile Include="CustomUserControlCpp.cpp" />
+    <ClCompile Include="CustomUserControlViewManagerCpp.cpp" />
+    <ClCompile Include="CircleViewManagerCpp.cpp" />
     <ClCompile Include="DebugHelpers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="ReactPackageProvider.h" />
-    <ClInclude Include="SampleModuleCPP.h" />
-    <ClInclude Include="CustomUserControlCPP.h" />
-    <ClInclude Include="CustomUserControlViewManagerCPP.h" />
-    <ClInclude Include="CircleViewManagerCPP.h" />
+    <ClInclude Include="SampleModuleCpp.h" />
+    <ClInclude Include="CustomUserControlCpp.h" />
+    <ClInclude Include="CustomUserControlViewManagerCpp.h" />
+    <ClInclude Include="CircleViewManagerCpp.h" />
     <ClInclude Include="DebugHelpers.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="SampleLibraryCPP.def" />
+    <None Include="SampleLibraryCpp.def" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -42,7 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <Midl Include="ReactPackageProvider.idl" />
-    <Midl Include="CustomUserControlCPP.idl" />
+    <Midl Include="CustomUserControlCpp.idl" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Themes\Generic.xaml">
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h
index c59bc041f49..e3ae22cd88b 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h
@@ -12,13 +12,13 @@
 #include "DebugHelpers.h"
 #include "NativeModules.h"
 
-namespace SampleLibraryCPP {
+namespace SampleLibraryCpp {
 
 // Sample REACT_MODULE
 
-REACT_MODULE(SampleModuleCPP);
-struct SampleModuleCPP {
-  const std::string Name = "SampleModuleCPP";
+REACT_MODULE(SampleModuleCpp);
+struct SampleModuleCpp {
+  const std::string Name = "SampleModuleCpp";
 
 #pragma region Constants
 
@@ -118,13 +118,13 @@ struct SampleModuleCPP {
 
 #pragma region Events
 
-  REACT_EVENT(TimedEvent, L"TimedEventCPP");
+  REACT_EVENT(TimedEvent, L"TimedEventCpp");
   std::function<void(int)> TimedEvent;
 
 #pragma endregion
 
  public:
-  SampleModuleCPP() {
+  SampleModuleCpp() {
     m_timer = winrt::Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer(
         [this](const winrt::Windows::System::Threading::ThreadPoolTimer) noexcept {
           if (TimedEvent) {
@@ -134,7 +134,7 @@ struct SampleModuleCPP {
         std::chrono::milliseconds(TimedEventIntervalMS));
   }
 
-  ~SampleModuleCPP() {
+  ~SampleModuleCpp() {
     if (m_timer) {
       m_timer.Cancel();
     }
@@ -146,4 +146,4 @@ struct SampleModuleCPP {
   const int TimedEventIntervalMS = 5000;
 };
 
-} // namespace SampleLibraryCPP
+} // namespace SampleLibraryCpp
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/Themes/Generic.xaml b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/Themes/Generic.xaml
index 758d8d8c5b7..716bd51b453 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/Themes/Generic.xaml
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SampleLibraryCPP">
+    xmlns:local="using:SampleLibraryCpp">
     
-    <Style TargetType="local:CustomUserControlCPP" >
+    <Style TargetType="local:CustomUserControlCpp" >
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:CustomUserControlCPP">
+                <ControlTemplate TargetType="local:CustomUserControlCpp">
                     <Border
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/readme.txt b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/readme.txt
index de220a56730..664fee88aee 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/readme.txt
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/readme.txt
@@ -1,5 +1,5 @@
 ========================================================================
-    C++/WinRT SampleLibraryCPP Project Overview
+    C++/WinRT SampleLibraryCpp Project Overview
 ========================================================================
 
 This project demonstrates how to get started authoring Windows Runtime