Index: Core/Gui/test/Core.Gui.Test/Commands/GuiImportHandlerTest.cs
===================================================================
diff -u -r519cab13efb803884d0eaf1bafbc662ef2a2a692 -rb9dc436e9ebb97c6f8f8b18bd6d985d9c3e0ec8e
--- Core/Gui/test/Core.Gui.Test/Commands/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision 519cab13efb803884d0eaf1bafbc662ef2a2a692)
+++ Core/Gui/test/Core.Gui.Test/Commands/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision b9dc436e9ebb97c6f8f8b18bd6d985d9c3e0ec8e)
@@ -63,12 +63,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             // Call
-            void Call() => new GuiImportHandler(viewParent, null, inquiryHelper);
+            void Call() => new GuiImportHandler(dialogParent, null, inquiryHelper);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -81,11 +81,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             mockRepository.ReplayAll();
 
             // Call
-            void Call() => new GuiImportHandler(viewParent, Enumerable.Empty<ImportInfo>(), null);
+            void Call() => new GuiImportHandler(dialogParent, Enumerable.Empty<ImportInfo>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
Index: Core/Gui/test/Core.Gui.Test/Commands/GuiUpdateHandlerTest.cs
===================================================================
diff -u -r886b86a66f072735567285a3489923186c236c32 -rb9dc436e9ebb97c6f8f8b18bd6d985d9c3e0ec8e
--- Core/Gui/test/Core.Gui.Test/Commands/GuiUpdateHandlerTest.cs	(.../GuiUpdateHandlerTest.cs)	(revision 886b86a66f072735567285a3489923186c236c32)
+++ Core/Gui/test/Core.Gui.Test/Commands/GuiUpdateHandlerTest.cs	(.../GuiUpdateHandlerTest.cs)	(revision b9dc436e9ebb97c6f8f8b18bd6d985d9c3e0ec8e)
@@ -62,12 +62,12 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             mockRepository.ReplayAll();
 
             // Call
-            void Call() => new GuiUpdateHandler(viewParent, null, inquiryHelper);
+            void Call() => new GuiUpdateHandler(dialogParent, null, inquiryHelper);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -80,11 +80,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             mockRepository.ReplayAll();
 
             // Call
-            void Call() => new GuiUpdateHandler(viewParent, Enumerable.Empty<UpdateInfo>(), null);
+            void Call() => new GuiUpdateHandler(dialogParent, Enumerable.Empty<UpdateInfo>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -358,13 +358,13 @@
             var targetObject = new object();
 
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();
 
-            var updateHandler = new GuiUpdateHandler(viewParent, new UpdateInfo[]
+            var updateHandler = new GuiUpdateHandler(dialogParent, new UpdateInfo[]
             {
                 new UpdateInfo<object>
                 {
@@ -397,14 +397,14 @@
             var targetObject = new object();
 
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return(null);
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();
 
             const string currentPath = "FilePath/to/Update";
-            var updateHandler = new GuiUpdateHandler(viewParent, new UpdateInfo[]
+            var updateHandler = new GuiUpdateHandler(dialogParent, new UpdateInfo[]
             {
                 new UpdateInfo<object>
                 {
@@ -437,15 +437,15 @@
             var generator = new FileFilterGenerator();
             var targetObject = new object();
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator.Filter)).Return("/some/path");
             var fileImporter = mockRepository.Stub<IFileImporter>();
             mockRepository.ReplayAll();
 
             var isVerifyUpdatedCalled = false;
 
-            var updateHandler = new GuiUpdateHandler(viewParent, new UpdateInfo[]
+            var updateHandler = new GuiUpdateHandler(dialogParent, new UpdateInfo[]
             {
                 new UpdateInfo<object>
                 {
@@ -488,7 +488,7 @@
             };
 
             var mockRepository = new MockRepository();
-            var viewParent = mockRepository.Stub<IViewParent>();
+            var dialogParent = mockRepository.Stub<IViewParent>();
             var inquiryHelper = mockRepository.Stub<IInquiryHelper>();
             mockRepository.ReplayAll();
 
@@ -503,7 +503,7 @@
                 }
             };
 
-            var updateHandler = new GuiUpdateHandler(viewParent, new UpdateInfo[]
+            var updateHandler = new GuiUpdateHandler(dialogParent, new UpdateInfo[]
             {
                 updateInfoA,
                 updateInfoB