diff --git a/archunit/src/test/java/com/tngtech/archunit/library/GeneralCodingRulesTest.java b/archunit/src/test/java/com/tngtech/archunit/library/GeneralCodingRulesTest.java
index 09c149384..a091ad084 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/GeneralCodingRulesTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/GeneralCodingRulesTest.java
@@ -5,7 +5,7 @@
 import com.tngtech.archunit.library.testclasses.packages.correct.defaultsuffix.ImplementationClassWithCorrectPackage;
 import com.tngtech.archunit.library.testclasses.packages.correct.notest.ImplementationClassWithoutTestClass;
 import com.tngtech.archunit.library.testclasses.packages.correct.onedirmatching.ImplementationClassWithOneTestPackageMatchingOutOfTwo;
-import com.tngtech.archunit.library.testclasses.packages.correct.twoimplementationsonetestdir1.MultipleImplementationsWithOnlyOneTestAndInRightPackage;
+import com.tngtech.archunit.library.testclasses.packages.correct.twoimplementationsonetestdir1.SimpleNameThatOccursInSeveralPackages;
 import com.tngtech.archunit.library.testclasses.packages.incorrect.nodirmatching.ImplementationClassWithMultipleTestsNotMatchingImplementationClassPackage;
 import com.tngtech.archunit.library.testclasses.packages.incorrect.wrongsubdir.customsuffix.ImplementationClassWithWrongTestClassPackageCustomSuffix;
 import com.tngtech.archunit.library.testclasses.packages.incorrect.wrongsubdir.customsuffix.subdir.ImplementationClassWithWrongTestClassPackageCustomSuffixTestingScenario;
@@ -88,8 +88,8 @@ public void should_not_pass_when_none_of_multiple_matching_test_classes_resides_
     public void should_pass_when_only_one_of_two_implementations_have_test_class_and_it_is_in_implementation_package() {
         assertThatRule(testClassesShouldResideInTheSamePackageAsImplementation())
                 .checking(new ClassFileImporter().importPackagesOf(
-                        MultipleImplementationsWithOnlyOneTestAndInRightPackage.class,
-                        com.tngtech.archunit.library.testclasses.packages.incorrect.twoimplementationsonetestdir2.MultipleImplementationsWithOnlyOneTestAndInRightPackage.class
+                        SimpleNameThatOccursInSeveralPackages.class,
+                        com.tngtech.archunit.library.testclasses.packages.incorrect.twoimplementationsonetestdir2.SimpleNameThatOccursInSeveralPackages.class
                 ))
                 .hasNoViolation();
     }
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/MultipleImplementationsWithOnlyOneTestAndInRightPackage.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/SimpleNameThatOccursInSeveralPackages.java
similarity index 58%
rename from archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/MultipleImplementationsWithOnlyOneTestAndInRightPackage.java
rename to archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/SimpleNameThatOccursInSeveralPackages.java
index b588c8b81..6fa3e2b04 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/MultipleImplementationsWithOnlyOneTestAndInRightPackage.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/SimpleNameThatOccursInSeveralPackages.java
@@ -1,4 +1,4 @@
 package com.tngtech.archunit.library.testclasses.packages.correct.twoimplementationsonetestdir1;
 
-public class MultipleImplementationsWithOnlyOneTestAndInRightPackage {
+public class SimpleNameThatOccursInSeveralPackages {
 }
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/OnlyOneImplementationHaveTestAndItIsMatchingImplPackageTest.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/SimpleNameThatOccursInSeveralPackagesTest.java
similarity index 57%
rename from archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/OnlyOneImplementationHaveTestAndItIsMatchingImplPackageTest.java
rename to archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/SimpleNameThatOccursInSeveralPackagesTest.java
index ebd29a2a6..58097a5b5 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/OnlyOneImplementationHaveTestAndItIsMatchingImplPackageTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/correct/twoimplementationsonetestdir1/SimpleNameThatOccursInSeveralPackagesTest.java
@@ -1,4 +1,4 @@
 package com.tngtech.archunit.library.testclasses.packages.correct.twoimplementationsonetestdir1;
 
-public class OnlyOneImplementationHaveTestAndItIsMatchingImplPackageTest {
+class SimpleNameThatOccursInSeveralPackagesTest {
 }
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/incorrect/twoimplementationsonetestdir2/MultipleImplementationsWithOnlyOneTestAndInRightPackage.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/incorrect/twoimplementationsonetestdir2/SimpleNameThatOccursInSeveralPackages.java
similarity index 58%
rename from archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/incorrect/twoimplementationsonetestdir2/MultipleImplementationsWithOnlyOneTestAndInRightPackage.java
rename to archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/incorrect/twoimplementationsonetestdir2/SimpleNameThatOccursInSeveralPackages.java
index 6456b7d36..c1c69d3bd 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/incorrect/twoimplementationsonetestdir2/MultipleImplementationsWithOnlyOneTestAndInRightPackage.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/packages/incorrect/twoimplementationsonetestdir2/SimpleNameThatOccursInSeveralPackages.java
@@ -1,4 +1,4 @@
 package com.tngtech.archunit.library.testclasses.packages.incorrect.twoimplementationsonetestdir2;
 
-public class MultipleImplementationsWithOnlyOneTestAndInRightPackage {
+public class SimpleNameThatOccursInSeveralPackages {
 }