8 files changed, 11 insertions, 11 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index a7da13bb..020f58b3 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -22,7 +22,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         // As outlined in RFC 4122, this is our namespace for generating name-based (version 3) UUIDs.
         internal static readonly Guid WixComponentGuidNamespace = new Guid("{3064E5C6-FB63-4FE9-AC49-E446A792EFA5}");
 
-        public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendExtension> backendExtension, Validator validator)
+        public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtension, Validator validator)
         {
             this.Messaging = context.ServiceProvider.GetService<IMessaging>();
 
@@ -66,7 +66,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public bool DeltaBinaryPatch { get; set; }
 
-        private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
+        private IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { get; }
 
         private Intermediate Intermediate { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
index 541dacf8..2a717ec5 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
     public class CabinetResolver
     {
-        public CabinetResolver(string cabCachePath, IEnumerable<IWindowsInstallerBackendExtension> backendExtensions)
+        public CabinetResolver(string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
         {
             this.CabCachePath = cabCachePath;
 
@@ -23,7 +23,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private string CabCachePath { get; }
 
-        private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
+        private IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { get; }
 
         public ResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<FileFacade> fileFacades)
         {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index a85312c4..88be831e 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -64,7 +64,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         /// </summary>
         public CompressionLevel? DefaultCompressionLevel { private get; set; }
 
-        public IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { private get; set; }
+        public IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { private get; set; }
 
         public Output Output { private get; set; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index ac770823..4d5d278b 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -14,14 +14,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
     internal class CreateOutputFromIRCommand
     {
-        public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendExtension> backendExtensions)
+        public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
         {
             this.Section = section;
             this.TableDefinitions = tableDefinitions;
             this.BackendExtensions = backendExtensions;
         }
 
-        private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
+        private IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { get; }
 
         private TableDefinitionCollection TableDefinitions { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 8b63ae9a..579977fe 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Core.WindowsInstaller
         {
             var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();
 
-            var backendExtensions = extensionManager.Create<IWindowsInstallerBackendExtension>();
+            var backendExtensions = extensionManager.Create<IWindowsInstallerBackendBinderExtension>();
 
             foreach (var extension in backendExtensions)
             {
diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
index c12e6c79..de9c4162 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller
         {
             var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();
 
-            var backendExtensions = extensionManager.Create<IWindowsInstallerBackendExtension>();
+            var backendExtensions = extensionManager.Create<IWindowsInstallerBackendBinderExtension>();
 
             foreach (var extension in backendExtensions)
             {
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 7216ae2a..74c886d6 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Core
             this.Singletons = new Dictionary<Type, object>();
 
             // Singletons.
-            this.AddService((provider, singletons) => AddSingleton<IExtensionManager>(singletons, new ExtensionManager()));
+            this.AddService((provider, singletons) => AddSingleton<IExtensionManager>(singletons, new ExtensionManager(provider)));
             this.AddService((provider, singletons) => AddSingleton<IMessaging>(singletons, new Messaging()));
             this.AddService((provider, singletons) => AddSingleton<ITupleDefinitionCreator>(singletons, new TupleDefinitionCreator(provider)));
             this.AddService((provider, singletons) => AddSingleton<IParseHelper>(singletons, new ParseHelper(provider)));
diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
index f00a5102..c5aeadba 100644
--- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
+++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
@@ -6,7 +6,7 @@ namespace Example.Extension
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
 
-    internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension
+    internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendBinderExtension
     {
         public override bool TryAddTupleToOutput(IntermediateTuple tuple, Output output)
         {