diff --git a/Eve-O-Preview/Eve-O-Preview.csproj b/Eve-O-Preview/Eve-O-Preview.csproj
index 946f729..cd4ae53 100644
--- a/Eve-O-Preview/Eve-O-Preview.csproj
+++ b/Eve-O-Preview/Eve-O-Preview.csproj
@@ -145,7 +145,7 @@
     <Compile Include="Services\Implementation\WindowManager.cs" />
     <Compile Include="Services\Interop\User32NativeMethods.cs" />
     <Compile Include="Presenters\Implementation\MainFormPresenter.cs" />
-    <Compile Include="Presenters\ViewCloseRequest.cs" />
+    <Compile Include="Presenters\Interface\ViewCloseRequest.cs" />
     <Compile Include="Presenters\Implementation\ViewZoomAnchorConverter.cs" />
     <Compile Include="View\Interface\IThumbnailViewFactory.cs" />
     <Compile Include="Services\Interface\IThumbnailManager.cs" />
diff --git a/Eve-O-Preview/Mediator/Handlers/Services/StartServiceHandler.cs b/Eve-O-Preview/Mediator/Handlers/Services/StartServiceHandler.cs
index 180668b..7c7f493 100644
--- a/Eve-O-Preview/Mediator/Handlers/Services/StartServiceHandler.cs
+++ b/Eve-O-Preview/Mediator/Handlers/Services/StartServiceHandler.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using EveOPreview.Mediator.Messages;
-using EveOPreview.UI;
+using EveOPreview.Services;
 using MediatR;
 
 namespace EveOPreview.Mediator.Handlers.Services
@@ -17,7 +17,7 @@ namespace EveOPreview.Mediator.Handlers.Services
 
 		public Task Handle(StartService message, CancellationToken cancellationToken)
 		{
-			this._manager.Activate();
+			this._manager.Start();
 
 			return Task.CompletedTask;
 		}
diff --git a/Eve-O-Preview/Mediator/Handlers/Services/StopServiceHandler.cs b/Eve-O-Preview/Mediator/Handlers/Services/StopServiceHandler.cs
index 75143d8..be248cf 100644
--- a/Eve-O-Preview/Mediator/Handlers/Services/StopServiceHandler.cs
+++ b/Eve-O-Preview/Mediator/Handlers/Services/StopServiceHandler.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using EveOPreview.Mediator.Messages;
-using EveOPreview.UI;
+using EveOPreview.Services;
 using MediatR;
 
 namespace EveOPreview.Mediator.Handlers.Services
@@ -17,7 +17,7 @@ namespace EveOPreview.Mediator.Handlers.Services
 
 		public Task Handle(StopService message, CancellationToken cancellationToken)
 		{
-			this._manager.Deactivate();
+			this._manager.Stop();
 
 			return Task.CompletedTask;
 		}
diff --git a/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs b/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs
index 4756e7b..035b1c7 100644
--- a/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs
+++ b/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs
@@ -77,7 +77,7 @@ namespace EveOPreview.Presenters
 			{
 				this._mediator.Send(new StopService()).Wait();
 
-				this._thumbnailManager.Deactivate();
+				this._thumbnailManager.Stop();
 				this._configurationStorage.Save();
 				request.Allow = true;
 				return;
diff --git a/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs b/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
index b1a0ef9..52fd2f3 100644
--- a/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
+++ b/Eve-O-Preview/Services/Implementation/ThumbnailManager.cs
@@ -57,14 +57,14 @@ namespace EveOPreview.Services
 			this._thumbnailUpdateTimer.Interval = new TimeSpan(0, 0, 0, 0, configuration.ThumbnailRefreshPeriod);
 		}
 
-		public void Activate()
+		public void Start()
 		{
 			this._thumbnailUpdateTimer.Start();
 
 			this.RefreshThumbnails();
 		}
 
-		public void Deactivate()
+		public void Stop()
 		{
 			this._thumbnailUpdateTimer.Stop();
 		}
diff --git a/Eve-O-Preview/Services/Interface/IThumbnailManager.cs b/Eve-O-Preview/Services/Interface/IThumbnailManager.cs
index a3a5788..d5868b4 100644
--- a/Eve-O-Preview/Services/Interface/IThumbnailManager.cs
+++ b/Eve-O-Preview/Services/Interface/IThumbnailManager.cs
@@ -5,8 +5,8 @@ namespace EveOPreview.Services
 {
 	public interface IThumbnailManager
 	{
-		void Activate();
-		void Deactivate();
+		void Start();
+		void Stop();
 
 		void SetThumbnailState(IntPtr thumbnailId, bool hideAlways);
 		void SetThumbnailsSize(Size size);