3 files changed, 6 insertions, 6 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index da42506a..a175bc77 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -46,7 +46,7 @@ namespace WixToolset.Core
         private string activeLanguage;
 
         // TODO: Implement this differently to not require the VariableResolver.
-        private WixVariableResolver componentIdPlaceholdersResolver;
+        private VariableResolver componentIdPlaceholdersResolver;
 
         /// <summary>
         /// Type of RadioButton element in a group.
@@ -132,7 +132,7 @@ namespace WixToolset.Core
 
                 this.Core = new CompilerCore(target, this.Messaging, parseHelper, extensionsByNamespace);
                 this.Core.ShowPedanticMessages = this.ShowPedanticMessages;
-                this.componentIdPlaceholdersResolver = new WixVariableResolver(this.ServiceProvider);
+                this.componentIdPlaceholdersResolver = new VariableResolver(this.ServiceProvider);
 
                 // parse the document
                 var source = this.Context.Source;
diff --git a/src/WixToolset.Core/WixVariableResolver.cs b/src/WixToolset.Core/VariableResolver.cs
index 9d604065..eb65d3d6 100644
--- a/src/WixToolset.Core/WixVariableResolver.cs
+++ b/src/WixToolset.Core/VariableResolver.cs
@@ -12,16 +12,16 @@ namespace WixToolset.Core
     /// <summary>
     /// WiX variable resolver.
     /// </summary>
-    internal class WixVariableResolver : IVariableResolver
+    internal class VariableResolver : IVariableResolver
     {
         private readonly Dictionary<string, BindVariable> locVariables;
         private readonly Dictionary<string, BindVariable> wixVariables;
         private readonly Dictionary<string, LocalizedControl> localizedControls;
 
         /// <summary>
-        /// Instantiate a new WixVariableResolver.
+        /// Instantiate a new VariableResolver.
         /// </summary>
-        internal WixVariableResolver(IServiceProvider serviceProvider)
+        internal VariableResolver(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
 
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 5c7b318e..f7c23cd7 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -50,7 +50,7 @@ namespace WixToolset.Core
             this.AddService<IResolver>((provider, singletons) => new Resolver(provider));
 
             this.AddService<ILocalizer>((provider, singletons) => new Localizer(provider));
-            this.AddService<IVariableResolver>((provider, singletons) => new WixVariableResolver(provider));
+            this.AddService<IVariableResolver>((provider, singletons) => new VariableResolver(provider));
         }
 
         private Dictionary<Type, Func<IServiceProvider, Dictionary<Type, object>, object>> CreationFunctions { get; }