diff --git a/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java b/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java
index 4666bc71f..2c4280ec4 100644
--- a/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java
+++ b/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java
@@ -515,12 +515,12 @@ public void check(JavaClass implementationClass, ConditionEvents events) {
      */
     @PublicAPI(usage = ACCESS)
     public static final ArchRule OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED =
-      noClasses()
-        .should().dependOnClassesThat().haveFullyQualifiedName("java.sql.Date")
-        .orShould().dependOnClassesThat().haveFullyQualifiedName("java.sql.Time")
-        .orShould().dependOnClassesThat().haveFullyQualifiedName("java.sql.Timestamp")
-        .orShould().dependOnClassesThat().haveFullyQualifiedName("java.util.Calendar")
-        .orShould().dependOnClassesThat().haveFullyQualifiedName("java.util.Date")
-        .as("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.")
-        .because("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.");
-}
+            noClasses()
+                    .should().dependOnClassesThat().haveFullyQualifiedName("java.sql.Date")
+                    .orShould().dependOnClassesThat().haveFullyQualifiedName("java.sql.Time")
+                    .orShould().dependOnClassesThat().haveFullyQualifiedName("java.sql.Timestamp")
+                    .orShould().dependOnClassesThat().haveFullyQualifiedName("java.util.Calendar")
+                    .orShould().dependOnClassesThat().haveFullyQualifiedName("java.util.Date")
+                    .as("java.time API should be used")
+                    .because("legacy date/time APIs have been replaced since Java 8 (JSR 310)");
+}
\ No newline at end of file
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 bc756adfa..16faf91ae 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/GeneralCodingRulesTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/GeneralCodingRulesTest.java
@@ -187,45 +187,43 @@ void origin() {
     private @interface DeprecatedAnnotation {
     }
 
-
-
     @Test
     public void OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED_should_fail_when_class_uses_java_util_date() {
         assertThatRule(OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED)
-          .hasDescriptionContaining("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.")
-          .checking(new ClassFileImporter().importClasses(UsesJavaUtilDate.class))
-          .hasViolationContaining("calls method <java.util.Date");
+                .hasDescription("java.time API should be used, because legacy date/time APIs have been replaced since Java 8 (JSR 310)")
+                .checking(new ClassFileImporter().importClasses(UsesJavaUtilDate.class))
+                .hasViolationContaining("calls method <java.util.Date");
     }
 
     @Test
     public void OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED_should_fail_when_class_uses_java_sql_timestamp() {
         assertThatRule(OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED)
-          .hasDescriptionContaining("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.")
-          .checking(new ClassFileImporter().importClasses(UsesJavaSqlTimestamp.class))
-          .hasViolationContaining("calls constructor <java.sql.Timestamp");
+                .hasDescription("java.time API should be used, because legacy date/time APIs have been replaced since Java 8 (JSR 310)")
+                .checking(new ClassFileImporter().importClasses(UsesJavaSqlTimestamp.class))
+                .hasViolationContaining("calls constructor <java.sql.Timestamp");
     }
 
     @Test
     public void OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED_should_fail_when_class_uses_java_sql_time() {
         assertThatRule(OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED)
-          .hasDescriptionContaining("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.")
-          .checking(new ClassFileImporter().importClasses(UsesJavaSqlTime.class))
-          .hasViolationContaining("calls constructor <java.sql.Time");
+                .hasDescription("java.time API should be used, because legacy date/time APIs have been replaced since Java 8 (JSR 310)")
+                .checking(new ClassFileImporter().importClasses(UsesJavaSqlTime.class))
+                .hasViolationContaining("calls constructor <java.sql.Time");
     }
 
     @Test
     public void OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED_should_fail_when_class_uses_java_sql_date() {
         assertThatRule(OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED)
-          .hasDescriptionContaining("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.")
-          .checking(new ClassFileImporter().importClasses(UsesJavaSqlDate.class))
-          .hasViolationContaining("calls constructor <java.sql.Date");
+                .hasDescription("java.time API should be used, because legacy date/time APIs have been replaced since Java 8 (JSR 310)")
+                .checking(new ClassFileImporter().importClasses(UsesJavaSqlDate.class))
+                .hasViolationContaining("calls constructor <java.sql.Date");
     }
 
     @Test
     public void OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED_should_fail_when_class_uses_java_util_calender() {
         assertThatRule(OLD_DATE_AND_TIME_CLASSES_SHOULD_NOT_BE_USED)
-          .hasDescriptionContaining("since Java 8 (and JavaEE 7 if JPA is needed) java.time-API should be used.")
-          .checking(new ClassFileImporter().importClasses(UsesJavaUtilCalender.class))
-          .hasViolationContaining("calls method <java.util.Calendar");
+                .hasDescription("java.time API should be used, because legacy date/time APIs have been replaced since Java 8 (JSR 310)")
+                .checking(new ClassFileImporter().importClasses(UsesJavaUtilCalender.class))
+                .hasViolationContaining("calls method <java.util.Calendar");
     }
-}
+}
\ No newline at end of file
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlDate.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlDate.java
index 793bb3088..b150c277a 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlDate.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlDate.java
@@ -4,7 +4,7 @@
 
 public class UsesJavaSqlDate {
 
-  void usesSqlDate() {
-    Date badUsage = new Date(System.currentTimeMillis());
-  }
-}
+    void usesSqlDate() {
+        Date badUsage = new Date(System.currentTimeMillis());
+    }
+}
\ No newline at end of file
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTime.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTime.java
index 7145eb52c..c7a7b00ef 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTime.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTime.java
@@ -4,7 +4,7 @@
 
 public class UsesJavaSqlTime {
 
-  void usesSqlTimestamp() {
-    Time badUsage = new Time(System.currentTimeMillis());
-  }
-}
+    void usesSqlTimestamp() {
+        Time badUsage = new Time(System.currentTimeMillis());
+    }
+}
\ No newline at end of file
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTimestamp.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTimestamp.java
index b5bbf85d5..20a93e6fc 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTimestamp.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaSqlTimestamp.java
@@ -4,7 +4,7 @@
 
 public class UsesJavaSqlTimestamp {
 
-  void usesSqlTimestamp() {
-    Timestamp badUsage = new Timestamp(System.currentTimeMillis());
-  }
-}
+    void usesSqlTimestamp() {
+        Timestamp badUsage = new Timestamp(System.currentTimeMillis());
+    }
+}
\ No newline at end of file
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilCalender.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilCalender.java
index b40806f9c..f3ebe31d4 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilCalender.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilCalender.java
@@ -4,7 +4,7 @@
 
 public class UsesJavaUtilCalender {
 
-  void usesJavaUtilCalender() {
-    Calendar badUsage = Calendar.getInstance();
-  }
-}
+    void usesJavaUtilCalender() {
+        Calendar badUsage = Calendar.getInstance();
+    }
+}
\ No newline at end of file
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilDate.java b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilDate.java
index 3a40b5e18..314e1e34f 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilDate.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/testclasses/timeapi/incorrect/UsesJavaUtilDate.java
@@ -5,7 +5,7 @@
 
 public class UsesJavaUtilDate {
 
-  void usesJavaUtilDate() {
-    Date badDate = Date.from(Instant.now());
-  }
-}
+    void usesJavaUtilDate() {
+        Date badDate = Date.from(Instant.now());
+    }
+}
\ No newline at end of file