diff --git a/src/Orleans.Streaming.Grains.Performance/Configs/PersistentGrainTestConfig.cs b/src/Orleans.Streaming.Grains.Performance/Configs/GrainsStreamTestConfig.cs
similarity index 88%
rename from src/Orleans.Streaming.Grains.Performance/Configs/PersistentGrainTestConfig.cs
rename to src/Orleans.Streaming.Grains.Performance/Configs/GrainsStreamTestConfig.cs
index f4e6074..a5121f3 100644
--- a/src/Orleans.Streaming.Grains.Performance/Configs/PersistentGrainTestConfig.cs
+++ b/src/Orleans.Streaming.Grains.Performance/Configs/GrainsStreamTestConfig.cs
@@ -1,4 +1,4 @@
-// <copyright file="PersistentGrainTestConfig.cs" company="Surveily Sp. z o.o.">
+// <copyright file="GrainsStreamTestConfig.cs" company="Surveily Sp. z o.o.">
 // Copyright (c) Surveily Sp. z o.o.. All rights reserved.
 // </copyright>
 
@@ -13,7 +13,7 @@
 
 namespace Orleans.Streaming.Grains.Performance.Configs
 {
-    public abstract class PersistentGrainTestConfig : ISiloConfigurator, IClientBuilderConfigurator
+    public abstract class GrainsStreamTestConfig : ISiloConfigurator, IClientBuilderConfigurator
     {
         public abstract void Configure(IServiceCollection services);
 
@@ -35,7 +35,7 @@ public void Configure(IConfiguration configuration, IClientBuilder clientBuilder
         }
     }
 
-    public class PersistentConfig : PersistentGrainTestConfig, IDisposable
+    public class GrainsStreamConfig : GrainsStreamTestConfig, IDisposable
     {
         protected Mock<IProcessor> processor = new Mock<IProcessor>();
         private bool _isDisposed;
diff --git a/src/Orleans.Streaming.Grains.Performance/Configs/BasicGrainTestConfig.cs b/src/Orleans.Streaming.Grains.Performance/Configs/MemoryStreamTestConfig.cs
similarity index 87%
rename from src/Orleans.Streaming.Grains.Performance/Configs/BasicGrainTestConfig.cs
rename to src/Orleans.Streaming.Grains.Performance/Configs/MemoryStreamTestConfig.cs
index 573b706..dbcba8d 100644
--- a/src/Orleans.Streaming.Grains.Performance/Configs/BasicGrainTestConfig.cs
+++ b/src/Orleans.Streaming.Grains.Performance/Configs/MemoryStreamTestConfig.cs
@@ -1,4 +1,4 @@
-// <copyright file="BasicGrainTestConfig.cs" company="Surveily Sp. z o.o.">
+// <copyright file="MemoryStreamTestConfig.cs" company="Surveily Sp. z o.o.">
 // Copyright (c) Surveily Sp. z o.o.. All rights reserved.
 // </copyright>
 
@@ -13,7 +13,7 @@
 
 namespace Orleans.Streaming.Grains.Performance.Configs
 {
-    public abstract class BasicGrainTestConfig : ISiloConfigurator, IClientBuilderConfigurator
+    public abstract class MemoryStreamTestConfig : ISiloConfigurator, IClientBuilderConfigurator
     {
         public abstract void Configure(IServiceCollection services);
 
@@ -30,7 +30,7 @@ public void Configure(IConfiguration configuration, IClientBuilder clientBuilder
         }
     }
 
-    public class BasicConfig : BasicGrainTestConfig, IDisposable
+    public class MemoryStreamConfig : MemoryStreamTestConfig, IDisposable
     {
         protected Mock<IProcessor> processor = new Mock<IProcessor>();
         private bool _isDisposed;
diff --git a/src/Orleans.Streaming.Grains.Performance/Scenarios/OneToMany.cs b/src/Orleans.Streaming.Grains.Performance/Scenarios/OneToMany.cs
index a059bdb..c2a5bf8 100644
--- a/src/Orleans.Streaming.Grains.Performance/Scenarios/OneToMany.cs
+++ b/src/Orleans.Streaming.Grains.Performance/Scenarios/OneToMany.cs
@@ -104,11 +104,11 @@ private async Task RunAndWait(int counter, Func<Task> operation)
             }
         }
 
-        public class OneToManyBasicTest : BaseOneToManyTest<BasicConfig>
+        public class OneToManyMemoryStreamTest : BaseOneToManyTest<MemoryStreamConfig>
         {
         }
 
-        public class OneToManyPersistentTest : BaseOneToManyTest<PersistentConfig>
+        public class OneToManyGrainsStreamTest : BaseOneToManyTest<GrainsStreamConfig>
         {
         }
     }