diff --git a/junit-4/pom.xml b/junit-4/pom.xml
index e4fe1ba..4919171 100644
--- a/junit-4/pom.xml
+++ b/junit-4/pom.xml
@@ -75,7 +75,7 @@
                 </dependencies>
                 <configuration>
                     <includes>
-                        <include>com/browserstack/SampleTest.java</include>
+                        <include>com/browserstack/BStackSampleTest.java</include>
                     </includes>
                     <argLine>
                         -javaagent:${com.browserstack:browserstack-java-sdk:jar}
@@ -95,7 +95,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <includes>
-                                <include>com/browserstack/SampleTest.java</include>
+                                <include>com/browserstack/BStackSampleTest.java</include>
                             </includes>
                             <argLine>
                                 -javaagent:${com.browserstack:browserstack-java-sdk:jar}
@@ -115,7 +115,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <includes>
-                                <include>com/browserstack/LocalTest.java</include>
+                                <include>com/browserstack/BStackLocalTest.java</include>
                             </includes>
                             <argLine>
                                 -javaagent:${com.browserstack:browserstack-java-sdk:jar}
diff --git a/junit-4/src/test/java/com/browserstack/LocalTest.java b/junit-4/src/test/java/com/browserstack/BStackLocalTest.java
similarity index 85%
rename from junit-4/src/test/java/com/browserstack/LocalTest.java
rename to junit-4/src/test/java/com/browserstack/BStackLocalTest.java
index 71d476c..d57f90c 100644
--- a/junit-4/src/test/java/com/browserstack/LocalTest.java
+++ b/junit-4/src/test/java/com/browserstack/BStackLocalTest.java
@@ -7,7 +7,7 @@
 
 import static org.junit.Assert.assertTrue;
 
-public class LocalTest extends BrowserStackJUnitTest {
+public class BStackLocalTest extends BrowserStackJUnitTest {
 
     @Test
     public void test() {
diff --git a/junit-4/src/test/java/com/browserstack/SampleTest.java b/junit-4/src/test/java/com/browserstack/BStackSampleTest.java
similarity index 95%
rename from junit-4/src/test/java/com/browserstack/SampleTest.java
rename to junit-4/src/test/java/com/browserstack/BStackSampleTest.java
index ac68112..f8535f4 100644
--- a/junit-4/src/test/java/com/browserstack/SampleTest.java
+++ b/junit-4/src/test/java/com/browserstack/BStackSampleTest.java
@@ -10,7 +10,7 @@
 
 import static org.junit.Assert.assertTrue;
 
-public class SampleTest extends BrowserStackJUnitTest {
+public class BStackSampleTest extends BrowserStackJUnitTest {
 
     @Test
     public void test() {
diff --git a/junit-5/pom.xml b/junit-5/pom.xml
index 73efdf5..ed36d6e 100644
--- a/junit-5/pom.xml
+++ b/junit-5/pom.xml
@@ -13,8 +13,8 @@
         <selenium-java>4.1.4</selenium-java>
         <maven-surefire-plugin>3.0.0-M5</maven-surefire-plugin>
         <httpclient>4.5.13</httpclient>
-        <tests.single>**/tests.SingleTest.java</tests.single>
-        <tests.local>**/tests.LocalTest.java</tests.local>
+        <tests.single>**/tests.BStackSampleTest.java</tests.single>
+        <tests.local>**/tests.BStackLocalTest.java</tests.local>
     </properties>
     <dependencies>
         <dependency>
diff --git a/junit-5/src/test/java/tests/LocalTest.java b/junit-5/src/test/java/tests/BStackLocalTest.java
similarity index 87%
rename from junit-5/src/test/java/tests/LocalTest.java
rename to junit-5/src/test/java/tests/BStackLocalTest.java
index 4c0ae05..75a4872 100644
--- a/junit-5/src/test/java/tests/LocalTest.java
+++ b/junit-5/src/test/java/tests/BStackLocalTest.java
@@ -5,7 +5,7 @@
 import runners.BstackRunner;
 
 
-public class LocalTest extends BstackRunner {
+public class BStackLocalTest extends BstackRunner {
 
     @Test
     void localTest() {
diff --git a/junit-5/src/test/java/tests/SingleTest.java b/junit-5/src/test/java/tests/BStackSampleTest.java
similarity index 95%
rename from junit-5/src/test/java/tests/SingleTest.java
rename to junit-5/src/test/java/tests/BStackSampleTest.java
index 68ba878..74f55ce 100644
--- a/junit-5/src/test/java/tests/SingleTest.java
+++ b/junit-5/src/test/java/tests/BStackSampleTest.java
@@ -10,7 +10,7 @@
 
 import java.time.Duration;
 
-public class SingleTest extends BstackRunner {
+public class BStackSampleTest extends BstackRunner {
 
     @Test
     void singleTest() {