diff --git a/Kool.EditProject.Shared/Commands/BaseCommand.cs b/Kool.EditProject.Shared/Commands/BaseCommand.cs
index 6ceac23..09d9819 100644
--- a/Kool.EditProject.Shared/Commands/BaseCommand.cs
+++ b/Kool.EditProject.Shared/Commands/BaseCommand.cs
@@ -33,7 +33,7 @@ protected static void Open(string file)
         {
         }
 
-        protected IEnumerable<Project> SelectedProjects => VS.SelectedItems.OfType<SelectedItem>().Where(x => x.Project != null).Select(x => x.Project);
+        protected IEnumerable<Project> SelectedProjects => IDE.SelectedItems.OfType<SelectedItem>().Where(x => x.Project != null).Select(x => x.Project);
 
         protected virtual void OnBeforeQueryStatus()
         {
diff --git a/Kool.EditProject.Shared/Commands/EditSolutionCommand.cs b/Kool.EditProject.Shared/Commands/EditSolutionCommand.cs
index 6cfe87f..7639009 100644
--- a/Kool.EditProject.Shared/Commands/EditSolutionCommand.cs
+++ b/Kool.EditProject.Shared/Commands/EditSolutionCommand.cs
@@ -14,7 +14,7 @@ private EditSolutionCommand() : base(Ids.EDIT_SOLUTION_MENU_COMMAND_ID)
         {
         }
 
-        protected override void OnBeforeQueryStatus() => _solutionFile = VS.Solution.FullName;
+        protected override void OnBeforeQueryStatus() => _solutionFile = IDE.Solution.FullName;
 
         protected override void OnExecute()
         {
diff --git a/Kool.EditProject.Shared/EditProjectPackage.cs b/Kool.EditProject.Shared/EditProjectPackage.cs
index 673f9b6..77350b2 100644
--- a/Kool.EditProject.Shared/EditProjectPackage.cs
+++ b/Kool.EditProject.Shared/EditProjectPackage.cs
@@ -27,7 +27,7 @@ namespace Kool.EditProject
         delay: 1000)]
     public sealed class EditProjectPackage : AsyncPackage
     {
-        internal static DTE2 VS { get; private set; }
+        internal static DTE2 IDE { get; private set; }
         internal static Options Options { get; private set; }
         internal static EditProjectPackage Instance { get; private set; }
 
@@ -37,7 +37,7 @@ protected override async Tasks.Task InitializeAsync(CancellationToken cancellati
 
             await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
-            VS = await GetServiceAsync(typeof(DTE)) as DTE2;
+            IDE = await GetServiceAsync(typeof(DTE)) as DTE2;
             Options = (Options)GetDialogPage(typeof(Options));
 
             var cmds = await GetServiceAsync(typeof(IMenuCommandService)) as IMenuCommandService;
diff --git a/Kool.EditProject.Shared/Models/VsEditor.cs b/Kool.EditProject.Shared/Models/VsEditor.cs
index 10f5ed6..dc398f2 100644
--- a/Kool.EditProject.Shared/Models/VsEditor.cs
+++ b/Kool.EditProject.Shared/Models/VsEditor.cs
@@ -80,7 +80,7 @@ private Document FindDocument(string projectFile)
         {
             var editingFile = FindEditingFile(projectFile);
 
-            foreach (Document document in VS.Documents)
+            foreach (Document document in IDE.Documents)
             {
                 if (document.FullName == editingFile)
                 {
@@ -93,7 +93,7 @@ private Document FindDocument(string projectFile)
 
         private void RegisterListeners()
         {
-            _dteEvents = VS.Events;                         // Prevent it from GC.
+            _dteEvents = IDE.Events;                        // Prevent it from GC.
             _documentEvents = _dteEvents.DocumentEvents;    // Prevent it from GC.
             _documentEvents.DocumentSaved += DocumentEvents_DocumentSaved;
             _documentEvents.DocumentClosing += DocumentEvents_DocumentClosing;