Rename VBE* files/types to Vbe* for types we own.

bclothier · bclothier · commit e7e27d409078 · 2018-10-31T18:13:25.000-05:00
diff --git a/Rubberduck.Core/AutoComplete/Service/AutoCompleteService.cs b/Rubberduck.Core/AutoComplete/Service/AutoCompleteService.cs
@@ -57,8 +57,8 @@ private void Enable()
 
             if (!_enabled)
             {
-                VBENativeServices.KeyDown += HandleKeyDown;
-                VBENativeServices.IntelliSenseChanged += HandleIntelliSenseChanged;
+                VbeNativeServices.KeyDown += HandleKeyDown;
+                VbeNativeServices.IntelliSenseChanged += HandleIntelliSenseChanged;
                 _enabled = true;
             }
         }
@@ -67,8 +67,8 @@ private void Disable()
         {
             if (_enabled && _initialized)
             {
-                VBENativeServices.KeyDown -= HandleKeyDown;
-                VBENativeServices.IntelliSenseChanged -= HandleIntelliSenseChanged;
+                VbeNativeServices.KeyDown -= HandleKeyDown;
+                VbeNativeServices.IntelliSenseChanged -= HandleIntelliSenseChanged;
                 _enabled = false;
                 _popupShown = false;
             }
diff --git a/Rubberduck.Core/UI/Command/ReparseCommand.cs b/Rubberduck.Core/UI/Command/ReparseCommand.cs
@@ -9,11 +9,10 @@
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.Resources;
-using Rubberduck.UI.CodeExplorer.Commands;
 using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.VBERuntime.Settings;
+using Rubberduck.VBEditor.VbeRuntime.Settings;
 
 namespace Rubberduck.UI.Command
 {
@@ -22,12 +21,12 @@ public class ReparseCommand : CommandBase
     {
         private readonly IVBE _vbe;
         private readonly IVBETypeLibsAPI _typeLibApi;
-        private readonly IVBESettings _vbeSettings;
+        private readonly IVbeSettings _vbeSettings;
         private readonly IMessageBox _messageBox;
         private readonly RubberduckParserState _state;
         private readonly GeneralSettings _settings;
 
-        public ReparseCommand(IVBE vbe, IConfigProvider<GeneralSettings> settingsProvider, RubberduckParserState state, IVBETypeLibsAPI typeLibApi, IVBESettings vbeSettings, IMessageBox messageBox) : base(LogManager.GetCurrentClassLogger())
+        public ReparseCommand(IVBE vbe, IConfigProvider<GeneralSettings> settingsProvider, RubberduckParserState state, IVBETypeLibsAPI typeLibApi, IVbeSettings vbeSettings, IMessageBox messageBox) : base(LogManager.GetCurrentClassLogger())
         {
             _vbe = vbe;
             _vbeSettings = vbeSettings;
diff --git a/Rubberduck.Core/UI/SelectionChangeService.cs b/Rubberduck.Core/UI/SelectionChangeService.cs
@@ -30,8 +30,8 @@ public SelectionChangeService(IVBE vbe, IParseCoordinator parser)
         {
             _parser = parser;
             _vbe = vbe;
-            VBENativeServices.SelectionChanged += OnVbeSelectionChanged;
-            VBENativeServices.WindowFocusChange += OnVbeFocusChanged;
+            VbeNativeServices.SelectionChanged += OnVbeSelectionChanged;
+            VbeNativeServices.WindowFocusChange += OnVbeFocusChanged;
         }
         
         private void OnVbeSelectionChanged(object sender, EventArgs e)
@@ -69,7 +69,7 @@ private void OnVbeFocusChanged(object sender, WindowChangedEventArgs e)
                         //Caret changed in a code pane.
                         Task.Run(() =>
                         {
-                            using (var pane = VBENativeServices.GetCodePaneFromHwnd(e.Hwnd))
+                            using (var pane = VbeNativeServices.GetCodePaneFromHwnd(e.Hwnd))
                             {
                                 DispatchSelectedDeclaration(
                                     new DeclarationChangedEventArgs(_vbe, _parser.State.FindSelectedDeclaration(pane)));
@@ -186,8 +186,8 @@ private bool DeclarationChanged(Declaration current)
 
         public void Dispose()
         {
-            VBENativeServices.SelectionChanged -= OnVbeSelectionChanged;
-            VBENativeServices.WindowFocusChange -= OnVbeFocusChanged;
+            VbeNativeServices.SelectionChanged -= OnVbeSelectionChanged;
+            VbeNativeServices.WindowFocusChange -= OnVbeFocusChanged;
         }
     }
 
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
@@ -8,7 +8,7 @@
 using NLog;
 using Rubberduck.SettingsProvider;
 using Rubberduck.UI.Command;
-using Rubberduck.VBEditor.VBERuntime.Settings;
+using Rubberduck.VBEditor.VbeRuntime.Settings;
 using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Settings
@@ -23,12 +23,12 @@ public class GeneralSettingsViewModel : SettingsViewModelBase, ISettingsViewMode
     {
         private readonly IOperatingSystem _operatingSystem;
         private readonly IMessageBox _messageBox;
-        private readonly IVBESettings _vbeSettings;
+        private readonly IVbeSettings _vbeSettings;
 
         private bool _indenterPrompted;
         private readonly ReadOnlyCollection<Type> _experimentalFeatureTypes;
 
-        public GeneralSettingsViewModel(Configuration config, IOperatingSystem operatingSystem, IMessageBox messageBox, IVBESettings vbeSettings, IEnumerable<Type> experimentalFeatureTypes)
+        public GeneralSettingsViewModel(Configuration config, IOperatingSystem operatingSystem, IMessageBox messageBox, IVbeSettings vbeSettings, IEnumerable<Type> experimentalFeatureTypes)
         {
             _operatingSystem = operatingSystem;
             _messageBox = messageBox;
diff --git a/Rubberduck.Core/UI/Settings/SettingsForm.cs b/Rubberduck.Core/UI/Settings/SettingsForm.cs
@@ -2,7 +2,7 @@
 using Rubberduck.Settings;
 using Rubberduck.Common;
 using Rubberduck.Interaction;
-using Rubberduck.VBEditor.VBERuntime.Settings;
+using Rubberduck.VBEditor.VbeRuntime.Settings;
 using System.Collections.Generic;
 using System;
 
@@ -21,7 +21,7 @@ public SettingsForm()
             InitializeComponent();
         }
 
-        public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, IMessageBox messageBox, IVBESettings vbeSettings, SettingsViews activeView = SettingsViews.GeneralSettings) : this()
+        public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, IMessageBox messageBox, IVbeSettings vbeSettings, SettingsViews activeView = SettingsViews.GeneralSettings) : this()
         {
             var config = configService.LoadConfiguration();
 
diff --git a/Rubberduck.Main/Extension.cs b/Rubberduck.Main/Extension.cs
@@ -60,7 +60,7 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
                 _addin.Object = this;
 
                 VbeProvider.Initialize(_vbe);
-                VBENativeServices.HookEvents(_vbe);
+                VbeNativeServices.HookEvents(_vbe);
 
 #if DEBUG
                 // FOR DEBUGGING/DEVELOPMENT PURPOSES, ALLOW ACCESS TO SOME VBETypeLibsAPI FEATURES FROM VBA
@@ -242,7 +242,7 @@ private void ShutdownAddIn()
             {
                 _logger.Log(LogLevel.Info, "Rubberduck is shutting down.");
                 _logger.Log(LogLevel.Trace, "Unhooking VBENativeServices events...");
-                VBENativeServices.UnhookEvents();
+                VbeNativeServices.UnhookEvents();
                 VbeProvider.Terminate();
 
                 _logger.Log(LogLevel.Trace, "Releasing dockable hosts...");
diff --git a/Rubberduck.Main/VbeProvider.cs b/Rubberduck.Main/VbeProvider.cs
@@ -1,5 +1,5 @@
 ﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.VBERuntime;
+using Rubberduck.VBEditor.VbeRuntime;
 
 namespace Rubberduck
 {
@@ -19,7 +19,7 @@ internal static class VbeProvider
         internal static void Initialize(IVBE vbe)
         {
             Vbe = vbe;
-            VbeRuntime = new VBERuntimeAccessor(vbe);
+            VbeRuntime = new VbeNativeApiAccessor(vbe);
         }
 
         internal static void Terminate()
@@ -30,6 +30,6 @@ internal static void Terminate()
         }
 
         internal static IVBE Vbe { get; private set; }
-        internal static IVBERuntime VbeRuntime { get; private set; }
+        internal static IVbeNativeApi VbeRuntime { get; private set; }
     }
 }
diff --git a/Rubberduck.VBEEditor/ComManagement/ComMessagePumper.cs b/Rubberduck.VBEEditor/ComManagement/ComMessagePumper.cs
@@ -1,7 +1,6 @@
 ﻿using System;
-using System.Threading;
 using Rubberduck.VBEditor.Utility;
-using Rubberduck.VBEditor.VBERuntime;
+using Rubberduck.VBEditor.VbeRuntime;
 
 namespace Rubberduck.VBEditor.ComManagement
 {
@@ -12,10 +11,10 @@ public interface IComMessagePumper
 
     public class ComMessagePumper : IComMessagePumper
     {
-        private readonly IVBERuntime _runtime;
+        private readonly IVbeNativeApi _runtime;
         private readonly IUiContextProvider _uiContext;
 
-        public ComMessagePumper(IUiContextProvider uiContext, IVBERuntime runtime)
+        public ComMessagePumper(IUiContextProvider uiContext, IVbeNativeApi runtime)
         {
             _uiContext = uiContext;
             _runtime = runtime;
diff --git a/Rubberduck.VBEEditor/Events/VBENativeServices.cs b/Rubberduck.VBEEditor/Events/VBENativeServices.cs
@@ -10,7 +10,7 @@
 namespace Rubberduck.VBEditor.Events
 {
     // ReSharper disable once InconsistentNaming
-    public static class VBENativeServices
+    public static class VbeNativeServices
     {
         private static User32.WinEventProc _eventProc;
         private static IntPtr _eventHandle;
diff --git a/Rubberduck.VBEEditor/VBERuntime/Settings/IVBESettings.cs b/Rubberduck.VBEEditor/VBERuntime/Settings/IVBESettings.cs
@@ -1,6 +1,6 @@
-namespace Rubberduck.VBEditor.VBERuntime.Settings
+namespace Rubberduck.VBEditor.VbeRuntime.Settings
 {
-    public interface IVBESettings
+    public interface IVbeSettings
     {
         DllVersion Version { get; }
         bool CompileOnDemand { get; set; }
diff --git a/Rubberduck.VBEEditor/VBERuntime/Settings/VBESettings.cs b/Rubberduck.VBEEditor/VBERuntime/Settings/VBESettings.cs
@@ -3,9 +3,9 @@
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.Utility;
 
-namespace Rubberduck.VBEditor.VBERuntime.Settings
+namespace Rubberduck.VBEditor.VbeRuntime.Settings
 {
-    public class VBESettings : IVBESettings
+    public class VbeSettings : IVbeSettings
     {
         private const string Vbe7SettingPath = @"HKEY_CURRENT_USER\Software\Microsoft\VBA\7.0\Common";
         private const string Vbe6SettingPath = @"HKEY_CURRENT_USER\Software\Microsoft\VBA\6.0\Common";
@@ -14,11 +14,11 @@ public class VBESettings : IVBESettings
         private readonly string _activeRegistryRootPath;
         private readonly string[] _registryRootPaths = { Vbe7SettingPath, Vbe6SettingPath };
 
-        public VBESettings(IVBE vbe, IRegistryWrapper registry)
+        public VbeSettings(IVBE vbe, IRegistryWrapper registry)
         {
             try
             {
-                switch (VBEDllVersion.GetCurrentVersion(vbe))
+                switch (VbeDllVersion.GetCurrentVersion(vbe))
                 {
                     case DllVersion.Vbe6:
                         Version = DllVersion.Vbe6;
diff --git a/Rubberduck.VBEEditor/VBERuntime/VBEDllVersion.cs b/Rubberduck.VBEEditor/VBERuntime/VBEDllVersion.cs
@@ -1,6 +1,6 @@
 ﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
-namespace Rubberduck.VBEditor.VBERuntime
+namespace Rubberduck.VBEditor.VbeRuntime
 {
     public enum DllVersion
     {
@@ -9,7 +9,7 @@ public enum DllVersion
         Vbe7
     }
 
-    public static class VBEDllVersion
+    public static class VbeDllVersion
     {
         public static DllVersion GetCurrentVersion(IVBE vbe)
         {
diff --git a/Rubberduck.VBEEditor/VbeRuntime/IVbeNativeApi.cs b/Rubberduck.VBEEditor/VbeRuntime/IVbeNativeApi.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 
-namespace Rubberduck.VBEditor.VBERuntime
+namespace Rubberduck.VBEditor.VbeRuntime
 {
-    public interface IVBERuntime
+    public interface IVbeNativeApi
     {
         string DllName { get; }
         int DoEvents();
diff --git a/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApi6.cs b/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApi6.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Runtime.InteropServices;
 
-namespace Rubberduck.VBEditor.VBERuntime
+namespace Rubberduck.VBEditor.VbeRuntime
 {
-    internal class VBERuntime6 : IVBERuntime
+    internal class VbeNativeApi6 : IVbeNativeApi
     {
         private const string _dllName = "vbe6.dll";
 
diff --git a/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApi7.cs b/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApi7.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Runtime.InteropServices;
 
-namespace Rubberduck.VBEditor.VBERuntime
+namespace Rubberduck.VBEditor.VbeRuntime
 {
-    internal class VBERuntime7 : IVBERuntime
+    internal class VbeNativeApi7 : IVbeNativeApi
     {
         private const string _dllName = "vbe7.dll";
 
diff --git a/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs b/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs
@@ -1,25 +1,25 @@
 ﻿using System;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
-namespace Rubberduck.VBEditor.VBERuntime
+namespace Rubberduck.VBEditor.VbeRuntime
 {
-    public class VBERuntimeAccessor : IVBERuntime
+    public class VbeNativeApiAccessor : IVbeNativeApi
     {
         private static DllVersion _version;
-        private readonly IVBERuntime _runtime;
+        private readonly IVbeNativeApi _runtime;
         
-        static VBERuntimeAccessor()
+        static VbeNativeApiAccessor()
         {
             _version = DllVersion.Unknown;
         }
         
-        public VBERuntimeAccessor(IVBE vbe)
+        public VbeNativeApiAccessor(IVBE vbe)
         {
             if (_version == DllVersion.Unknown)
             {
                 try
                 {
-                    _version = VBEDllVersion.GetCurrentVersion(vbe);
+                    _version = VbeDllVersion.GetCurrentVersion(vbe);
                 }
                 catch
                 {
@@ -29,33 +29,33 @@ public VBERuntimeAccessor(IVBE vbe)
             _runtime = InitializeRuntime();
         }
 
-        private static IVBERuntime InitializeRuntime()
+        private static IVbeNativeApi InitializeRuntime()
         {
             switch (_version)
             {
                 case DllVersion.Vbe7:
-                    return new VBERuntime7();
+                    return new VbeNativeApi7();
                 case DllVersion.Vbe6:
-                    return new VBERuntime6();
+                    return new VbeNativeApi6();
                 default:
                     return DetermineVersion();
             }
         }
 
-        private static IVBERuntime DetermineVersion()
+        private static IVbeNativeApi DetermineVersion()
         {
-            IVBERuntime runtime;
+            IVbeNativeApi runtime;
             try
             {
-                runtime = new VBERuntime7();
+                runtime = new VbeNativeApi7();
                 runtime.GetTimer();
                 _version = DllVersion.Vbe7;
             }
             catch
             {
                 try
                 {
-                    runtime = new VBERuntime6();
+                    runtime = new VbeNativeApi6();
                     runtime.GetTimer();
                     _version = DllVersion.Vbe6;
                 }
diff --git a/Rubberduck.VBEEditor/WindowsApi/SubclassManager.cs b/Rubberduck.VBEEditor/WindowsApi/SubclassManager.cs
@@ -86,7 +86,7 @@ private void SubclassRemoved(object sender, EventArgs eventArgs)
         private static void AssociateCodePane(object sender, EventArgs eventArgs)
         {
             var subclass = (CodePaneSubclass)sender;
-            subclass.VbeObject = VBENativeServices.GetCodePaneFromHwnd(subclass.Hwnd);
+            subclass.VbeObject = VbeNativeServices.GetCodePaneFromHwnd(subclass.Hwnd);
             SubclassLogger.Trace($"CodePane subclass for hWnd 0x{subclass.Hwnd.ToInt64():X8} associated itself with its VBE object.");
         }
 
diff --git a/RubberduckTests/Settings/GeneralSettingsTests.cs b/RubberduckTests/Settings/GeneralSettingsTests.cs
diff --git a/RubberduckTests/VBE/VBESettingsTests.cs b/RubberduckTests/VBE/VBESettingsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ private void Enable()`
`57`	`57`
`58`	`58`	`if (!_enabled)`
`59`	`59`	`{`
`60`		`- VBENativeServices.KeyDown += HandleKeyDown;`
`61`		`- VBENativeServices.IntelliSenseChanged += HandleIntelliSenseChanged;`
	`60`	`+ VbeNativeServices.KeyDown += HandleKeyDown;`
	`61`	`+ VbeNativeServices.IntelliSenseChanged += HandleIntelliSenseChanged;`
`62`	`62`	`_enabled = true;`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -67,8 +67,8 @@ private void Disable()`
`67`	`67`	`{`
`68`	`68`	`if (_enabled && _initialized)`
`69`	`69`	`{`
`70`		`- VBENativeServices.KeyDown -= HandleKeyDown;`
`71`		`- VBENativeServices.IntelliSenseChanged -= HandleIntelliSenseChanged;`
	`70`	`+ VbeNativeServices.KeyDown -= HandleKeyDown;`
	`71`	`+ VbeNativeServices.IntelliSenseChanged -= HandleIntelliSenseChanged;`
`72`	`72`	`_enabled = false;`
`73`	`73`	`_popupShown = false;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public SelectionChangeService(IVBE vbe, IParseCoordinator parser)`
`30`	`30`	`{`
`31`	`31`	`_parser = parser;`
`32`	`32`	`_vbe = vbe;`
`33`		`- VBENativeServices.SelectionChanged += OnVbeSelectionChanged;`
`34`		`- VBENativeServices.WindowFocusChange += OnVbeFocusChanged;`
	`33`	`+ VbeNativeServices.SelectionChanged += OnVbeSelectionChanged;`
	`34`	`+ VbeNativeServices.WindowFocusChange += OnVbeFocusChanged;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private void OnVbeSelectionChanged(object sender, EventArgs e)`
`@@ -69,7 +69,7 @@ private void OnVbeFocusChanged(object sender, WindowChangedEventArgs e)`
`69`	`69`	`//Caret changed in a code pane.`
`70`	`70`	`Task.Run(() =>`
`71`	`71`	`{`
`72`		`- using (var pane = VBENativeServices.GetCodePaneFromHwnd(e.Hwnd))`
	`72`	`+ using (var pane = VbeNativeServices.GetCodePaneFromHwnd(e.Hwnd))`
`73`	`73`	`{`
`74`	`74`	`DispatchSelectedDeclaration(`
`75`	`75`	`new DeclarationChangedEventArgs(_vbe, _parser.State.FindSelectedDeclaration(pane)));`
`@@ -186,8 +186,8 @@ private bool DeclarationChanged(Declaration current)`
`186`	`186`
`187`	`187`	`public void Dispose()`
`188`	`188`	`{`
`189`		`- VBENativeServices.SelectionChanged -= OnVbeSelectionChanged;`
`190`		`- VBENativeServices.WindowFocusChange -= OnVbeFocusChanged;`
	`189`	`+ VbeNativeServices.SelectionChanged -= OnVbeSelectionChanged;`
	`190`	`+ VbeNativeServices.WindowFocusChange -= OnVbeFocusChanged;`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Rubberduck.Settings;`
`3`	`3`	`using Rubberduck.Common;`
`4`	`4`	`using Rubberduck.Interaction;`
`5`		`-using Rubberduck.VBEditor.VBERuntime.Settings;`
	`5`	`+using Rubberduck.VBEditor.VbeRuntime.Settings;`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System;`
`8`	`8`
`@@ -21,7 +21,7 @@ public SettingsForm()`
`21`	`21`	`InitializeComponent();`
`22`	`22`	`}`
`23`	`23`
`24`		`- public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, IMessageBox messageBox, IVBESettings vbeSettings, SettingsViews activeView = SettingsViews.GeneralSettings) : this()`
	`24`	`+ public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, IMessageBox messageBox, IVbeSettings vbeSettings, SettingsViews activeView = SettingsViews.GeneralSettings) : this()`
`25`	`25`	`{`
`26`	`26`	`var config = configService.LoadConfiguration();`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`2`		`-using Rubberduck.VBEditor.VBERuntime;`
	`2`	`+using Rubberduck.VBEditor.VbeRuntime;`
`3`	`3`
`4`	`4`	`namespace Rubberduck`
`5`	`5`	`{`
`@@ -19,7 +19,7 @@ internal static class VbeProvider`
`19`	`19`	`internal static void Initialize(IVBE vbe)`
`20`	`20`	`{`
`21`	`21`	`Vbe = vbe;`
`22`		`- VbeRuntime = new VBERuntimeAccessor(vbe);`
	`22`	`+ VbeRuntime = new VbeNativeApiAccessor(vbe);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`internal static void Terminate()`
`@@ -30,6 +30,6 @@ internal static void Terminate()`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`internal static IVBE Vbe { get; private set; }`
`33`		`- internal static IVBERuntime VbeRuntime { get; private set; }`
	`33`	`+ internal static IVbeNativeApi VbeRuntime { get; private set; }`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using System.Threading;`
`3`	`2`	`using Rubberduck.VBEditor.Utility;`
`4`		`-using Rubberduck.VBEditor.VBERuntime;`
	`3`	`+using Rubberduck.VBEditor.VbeRuntime;`
`5`	`4`
`6`	`5`	`namespace Rubberduck.VBEditor.ComManagement`
`7`	`6`	`{`
`@@ -12,10 +11,10 @@ public interface IComMessagePumper`
`12`	`11`
`13`	`12`	`public class ComMessagePumper : IComMessagePumper`
`14`	`13`	`{`
`15`		`- private readonly IVBERuntime _runtime;`
	`14`	`+ private readonly IVbeNativeApi _runtime;`
`16`	`15`	`private readonly IUiContextProvider _uiContext;`
`17`	`16`
`18`		`- public ComMessagePumper(IUiContextProvider uiContext, IVBERuntime runtime)`
	`17`	`+ public ComMessagePumper(IUiContextProvider uiContext, IVbeNativeApi runtime)`
`19`	`18`	`{`
`20`	`19`	`_uiContext = uiContext;`
`21`	`20`	`_runtime = runtime;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`namespace Rubberduck.VBEditor.Events`
`11`	`11`	`{`
`12`	`12`	`// ReSharper disable once InconsistentNaming`
`13`		`- public static class VBENativeServices`
	`13`	`+ public static class VbeNativeServices`
`14`	`14`	`{`
`15`	`15`	`private static User32.WinEventProc _eventProc;`
`16`	`16`	`private static IntPtr _eventHandle;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-namespace Rubberduck.VBEditor.VBERuntime.Settings`
	`1`	`+namespace Rubberduck.VBEditor.VbeRuntime.Settings`
`2`	`2`	`{`
`3`		`- public interface IVBESettings`
	`3`	`+ public interface IVbeSettings`
`4`	`4`	`{`
`5`	`5`	`DllVersion Version { get; }`
`6`	`6`	`bool CompileOnDemand { get; set; }`