diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
index b2591b440..976d1b64f 100644
--- a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
+++ b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
@@ -124,7 +124,7 @@ protected override StringBuilder AppendParameter(StringBuilder buf, ParameterDef
         protected override string GetTypeKind(TypeDefinition t)
         {
             if (t.IsEnum || t.FullName == "System.Enum")
-                return "enum";
+                return "enum class";
             if (t.IsValueType)
                 return "struct";
             if (t.IsClass)
diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml
index 75a454f5f..1a97fd030 100644
--- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml
+++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Color.xml
@@ -1,7 +1,7 @@
 <Type Name="Color" FullName="Mono.DocTest.Color">
   <TypeSignature Language="C#" Value="public enum Color" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed Color extends System.Enum" />
-  <TypeSignature Language="C++ WINRT" Value="enum Color" />
+  <TypeSignature Language="C++ WINRT" Value="enum class Color" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml
index f12f0158d..384ed207c 100644
--- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml
+++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+Direction.xml
@@ -1,7 +1,7 @@
 <Type Name="Widget+Direction" FullName="Mono.DocTest.Widget+Direction">
   <TypeSignature Language="C#" Value="protected internal enum Widget.Direction" />
   <TypeSignature Language="ILAsm" Value=".class nested protected auto ansi sealed Widget/Direction extends System.Enum" />
-  <TypeSignature Language="C++ WINRT" Value="enum Widget::Direction" />
+  <TypeSignature Language="C++ WINRT" Value="enum class Widget::Direction" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest/Color.xml b/mdoc/Test/en.expected/Mono.DocTest/Color.xml
index e18d6852a..c9bb8b3d5 100644
--- a/mdoc/Test/en.expected/Mono.DocTest/Color.xml
+++ b/mdoc/Test/en.expected/Mono.DocTest/Color.xml
@@ -7,7 +7,7 @@
   <TypeSignature Language="JavaScript" Usage="var value = Mono.DocTest.Color.red" />
   <TypeSignature Language="C++ CLI" Value="public enum class Color" />
   <TypeSignature Language="C++ CX" Value="public enum class Color" />
-  <TypeSignature Language="C++ WINRT" Value="enum Color" />
+  <TypeSignature Language="C++ WINRT" Value="enum class Color" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml b/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml
index d484879f2..673a3d098 100644
--- a/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml
+++ b/mdoc/Test/en.expected/Mono.DocTest/Widget+Direction.xml
@@ -5,7 +5,7 @@
   <TypeSignature Language="VB.NET" Value="Protected Friend Enum Widget.Direction" />
   <TypeSignature Language="C++ CLI" Value="public protected enum class Widget::Direction" />
   <TypeSignature Language="C++ CX" Value="public protected enum class Widget::Direction" />
-  <TypeSignature Language="C++ WINRT" Value="enum Widget::Direction" />
+  <TypeSignature Language="C++ WINRT" Value="enum class Widget::Direction" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml b/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml
index 87873a92c..5b2ab6b1b 100644
--- a/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml
+++ b/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Color1.xml
@@ -1,7 +1,7 @@
 <Type Name="Color1" FullName="UwpTestWinRtComponentCpp.Color1">
   <TypeSignature Language="C#" Value="public enum Color1" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed Color1 extends System.Enum" />
-  <TypeSignature Language="C++ WINRT" Value="enum Color1" />
+  <TypeSignature Language="C++ WINRT" Value="enum class Color1" />
   <AssemblyInfo>
     <AssemblyName>UwpTestWinRtComponentCpp</AssemblyName>
     <AssemblyVersion>255.255.255.255</AssemblyVersion>
diff --git a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs
index 65e6a6146..b279dcaae 100644
--- a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs
+++ b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs
@@ -29,7 +29,7 @@ protected override TypeDefinition GetType(Type type)
         [Category("Type")]
         public void TypeSignature_enum()
         {
-            TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Color1", "enum Color1");
+            TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Color1", "enum class Color1");
         }
 
         [Test]