2 files changed, 5 insertions, 4 deletions

diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index 9c4cffbe..37b99a95 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -1540,7 +1540,8 @@ namespace WixToolset.Converters
         {
             var id = element.Attribute("Id")?.Value;
 
-            if (id?.StartsWith("WixUI_") == true
+            if (id != null
+                && (id == "WixUI_Advanced" || id == "WixUI_FeatureTree" || id == "WixUI_InstallDir" || id == "WixUI_Minimal" || id == "WixUI_Mondo")
                 && this.OnInformation(ConverterTestType.ReferencesReplaced, element, "UI, custom action, and property reference {0} has been replaced with strongly-typed element.", id))
             {
                 this.XRoot.SetAttributeValue(XNamespace.Xmlns + "ui", WixUiNamespace.NamespaceName);
diff --git a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
index 5f3809d4..786b18d8 100644
--- a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
@@ -34,11 +34,11 @@ namespace WixToolsetTest.Converters
                 "  <Fragment>",
                 "    <ui:WixUI Id=\"WixUI_Advanced\" />",
                 "    <ui:WixUI Id=\"WixUI_FeatureTree\" />",
-                "    <ui:WixUI Id=\"WixUI_BobsSpecialUI\" />",
+                "    <UIRef Id=\"WixUI_BobsSpecialUI\" />",
                 "    <UI>",
                 "      <ui:WixUI Id=\"WixUI_Advanced\" />",
                 "      <ui:WixUI Id=\"WixUI_FeatureTree\" />",
-                "      <ui:WixUI Id=\"WixUI_BobsSpecialUI\" />",
+                "      <UIRef Id=\"WixUI_BobsSpecialUI\" />",
                 "    </UI>",
                 "  </Fragment>",
                 "</Wix>"
@@ -50,7 +50,7 @@ namespace WixToolsetTest.Converters
             var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
-            Assert.Equal(7, errors);
+            Assert.Equal(5, errors);
 
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);