diff --git a/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceDescriptorTest.cs b/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceDescriptorTest.cs
index fb37d30..9753c97 100644
--- a/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceDescriptorTest.cs
+++ b/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceDescriptorTest.cs
@@ -143,10 +143,10 @@ namespace GameServiceWarden.Core.Tests.Modules.Games
         }
 
         [Fact]
-        public void ServiceLogPipeName_ServiceNotStarted_NullReturned()
+        public void ServiceLogPipeName_ServiceNotStarted_PipeNameReturned()
         {
             //Given
-            const string SERVICE_NAME = "ServiceLogPipeName_ServiceNotStarted_NullReturned";
+            const string SERVICE_NAME = "ServiceLogPipeName_ServiceNotStarted_PipeNameReturned";
             IService stubService = new FakeService();
             ServiceDescriptor serviceInfo = new ServiceDescriptor(stubService, SERVICE_NAME, "FakeModule", "FakeAssembly");
             //Then
diff --git a/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceManagerTest.cs b/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceManagerTest.cs
index e5563a5..bf5c671 100644
--- a/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceManagerTest.cs
+++ b/tests/GameServiceWarden.Core.Tests/Modules/Games/ServiceManagerTest.cs
@@ -185,11 +185,11 @@ namespace GameServiceWarden.Core.Tests.Modules.Games
         }
 
         [Fact]
-        public void StopService_Stopped_StateUpdated()
+        public void StopService_ServiceStartedThenStopped_StateUpdated()
         {
             //Given
             const string ASSEMBLY_NAME = "FakeAssembly";
-            const string FAKE_SERVICE_NAME = "StopService_Stopped_StateUpdated";
+            const string FAKE_SERVICE_NAME = "StopService_ServiceStartedThenStopped_StateUpdated";
             FakePersistence<IReadOnlyDictionary<string, IServiceModule>> stubPersistentModuleDictionary = new FakePersistence<IReadOnlyDictionary<string, IServiceModule>>();
             FakePersistence<ServiceDescriptor> stubPersistentServiceDictionary = new FakePersistence<ServiceDescriptor>();
             FakeServiceManagerMonitor stubMonitor = new FakeServiceManagerMonitor();