diff --git a/src/java.base/share/classes/java/text/Collator.java b/src/java.base/share/classes/java/text/Collator.java
index 78fb7c654b6d2..7f6db3103668c 100644
--- a/src/java.base/share/classes/java/text/Collator.java
+++ b/src/java.base/share/classes/java/text/Collator.java
@@ -138,7 +138,7 @@ public abstract class Collator
      * Collator strength value.  When set, only SECONDARY and above differences are
      * considered significant during comparison. The assignment of strengths
      * to language features is locale dependent. A common example is for
-     * different accented forms of the same base letter ("a" vs "\u00E4") to be
+     * different accented forms of the same base letter ("a" vs "ä" (U+00E9)) to be
      * considered a SECONDARY difference.
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
diff --git a/src/java.base/share/classes/java/text/RuleBasedCollator.java b/src/java.base/share/classes/java/text/RuleBasedCollator.java
index 045ca6e8e9b02..dc45dafb846f0 100644
--- a/src/java.base/share/classes/java/text/RuleBasedCollator.java
+++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java
@@ -591,7 +591,7 @@ public synchronized CollationKey getCollationKey(String source)
         // Here's a hypothetical example, with the collation element represented as
         // a three-digit number, one digit for primary, one for secondary, etc.
         //
-        // String:              A     a     B   \u00e9 <--(e-acute)
+        // String:              A     a     B   é (U+00E9, e-acute)
         // Collation Elements: 101   100   201  510
         //
         // Collation Key:      1125<null>0001<null>1010
diff --git a/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java
index d102ad5c87eee..403e3f90bea47 100644
--- a/src/java.base/share/classes/java/util/LocaleISOData.java
+++ b/src/java.base/share/classes/java/util/LocaleISOData.java
@@ -145,7 +145,7 @@ class LocaleISOData {
         + "mt" + "mlt"  // Maltese
         + "my" + "mya"  // Burmese
         + "na" + "nau"  // Nauru
-        + "nb" + "nob"  // Norwegian Bokm\u00e5l
+        + "nb" + "nob"  // Norwegian Bokmål
         + "nd" + "nde"  // North Ndebele
         + "ne" + "nep"  // Nepali
         + "ng" + "ndo"  // Ndonga
@@ -209,7 +209,7 @@ class LocaleISOData {
         + "uz" + "uzb"  // Uzbek
         + "ve" + "ven"  // Venda
         + "vi" + "vie"  // Vietnamese
-        + "vo" + "vol"  // Volap\u00fck
+        + "vo" + "vol"  // Volapük
         + "wa" + "wln"  // Walloon
         + "wo" + "wol"  // Wolof
         + "xh" + "xho"  // Xhosa
@@ -250,7 +250,7 @@ class LocaleISOData {
         + "BH" + "BHR"  // Bahrain, Kingdom of
         + "BI" + "BDI"  // Burundi, Republic of
         + "BJ" + "BEN"  // Benin, People's Republic of
-        + "BL" + "BLM"  // Saint Barth\u00e9lemy
+        + "BL" + "BLM"  // Saint Barthélemy
         + "BM" + "BMU"  // Bermuda
         + "BN" + "BRN"  // Brunei Darussalam
         + "BO" + "BOL"  // Bolivia, Plurinational State of
@@ -278,7 +278,7 @@ class LocaleISOData {
 //      + "CS" + "SCG"  // Serbia and Montenegro
         + "CU" + "CUB"  // Cuba, Republic of
         + "CV" + "CPV"  // Cape Verde, Republic of
-        + "CW" + "CUW"  // Cura\u00e7ao
+        + "CW" + "CUW"  // Curaçao
         + "CX" + "CXR"  // Christmas Island
         + "CY" + "CYP"  // Cyprus, Republic of
         + "CZ" + "CZE"  // Czech Republic
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
index 13094f927c418..fd5af24e5fd3c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
@@ -63,7 +63,7 @@
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
  *
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 public final class JavacTool implements JavaCompiler {
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
index 1df24181b2a3b..8f5fa83e05aa6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
@@ -33,7 +33,7 @@
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
  *
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 public class PropagatedException extends RuntimeException {
 
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
index 6d7056cd6169b..46c4b8e31689e 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
@@ -66,7 +66,7 @@
 /**
  * Converts values to {@link java.net.InetAddress} using {@link InetAddress#getByName(String) getByName}.
  *
- * @author <a href="mailto:r@ymund.de">Raymund F\u00FCl\u00F6p</a>
+ * @author <a href="mailto:r@ymund.de">Raymund Fülöp</a>
  */
 public class InetAddressConverter implements ValueConverter<InetAddress> {
     public InetAddress convert( String value ) {
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
index 8b1a905d0a14c..f458a0a6b0017 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
@@ -24,7 +24,7 @@
 /*
  *
  * @summary Check getEnclosingClass and other methods
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * a) Top level classes
  * b) Nested classes (static member classes)
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
index d4c87817ef88e..156d42dd6f88e 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
@@ -28,7 +28,7 @@
  * @modules jdk.compiler
  * @run testng/othervm EnclosingClassTest
  * @summary Check getEnclosingClass and other methods
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 import java.io.BufferedReader;
@@ -206,4 +206,3 @@ private void test(Object tests) {
         }
     }
 }
-
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
index 046c766d47409..220542239a05e 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
@@ -23,7 +23,7 @@
 
 /*
  * @summary Check getEnclosingClass and other methods
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 package common;
diff --git a/test/jdk/java/util/Collections/T5078378.java b/test/jdk/java/util/Collections/T5078378.java
index 19ffb9471ea76..d3c9c198e7077 100644
--- a/test/jdk/java/util/Collections/T5078378.java
+++ b/test/jdk/java/util/Collections/T5078378.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5078378
  * @summary REGRESSION: Some calls to Collections.binarySearch no longer compile
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile T5078378.java
  * @compile/fail -Xlint:unchecked -Werror T5078378.java
diff --git a/test/langtools/tools/javac/6330920/T6330920.java b/test/langtools/tools/javac/6330920/T6330920.java
index e9e315772956e..39a65954dbcb5 100644
--- a/test/langtools/tools/javac/6330920/T6330920.java
+++ b/test/langtools/tools/javac/6330920/T6330920.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     6330920
  * @summary Verify that javac doesn't duplicate method error on method with error
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6330920.out -XDrawDiagnostics T6330920.java
  */
 
diff --git a/test/langtools/tools/javac/6457284/T6457284.java b/test/langtools/tools/javac/6457284/T6457284.java
index a2a5b8a3f9c3f..f40d569ad9169 100644
--- a/test/langtools/tools/javac/6457284/T6457284.java
+++ b/test/langtools/tools/javac/6457284/T6457284.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6457284
  * @summary Internationalize "unnamed package" when the term is used in diagnostics
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.util
  */
diff --git a/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
index 205ee3fa8a4d2..bb248b13ea12b 100644
--- a/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
+++ b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6399361
  * @summary java.lang.Override specification should be revised
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile InterfaceImplements.java
  */
 
diff --git a/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
index d985a41fe9729..0b7b9de6857ac 100644
--- a/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
+++ b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6399361
  * @summary java.lang.Override specification should be revised
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile InterfaceOverride.java
  */
 
diff --git a/test/langtools/tools/javac/OverrideChecks/Private.java b/test/langtools/tools/javac/OverrideChecks/Private.java
index 1b52fbfe461d0..b69e360122880 100644
--- a/test/langtools/tools/javac/OverrideChecks/Private.java
+++ b/test/langtools/tools/javac/OverrideChecks/Private.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6399361
  * @summary java.lang.Override specification should be revised
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Private.out -XDrawDiagnostics  Private.java
  */
 
diff --git a/test/langtools/tools/javac/OverrideChecks/T6326485.java b/test/langtools/tools/javac/OverrideChecks/T6326485.java
index 8b4622d83047c..76b3e64f95484 100644
--- a/test/langtools/tools/javac/OverrideChecks/T6326485.java
+++ b/test/langtools/tools/javac/OverrideChecks/T6326485.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6326485
  * @summary Compiler does not enforce rule that interfaces may not use Override annotation
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6326485.java
  */
 
diff --git a/test/langtools/tools/javac/T4093617/T4093617.java b/test/langtools/tools/javac/T4093617/T4093617.java
index 8fa7dfaca559f..35b6dcaadb885 100644
--- a/test/langtools/tools/javac/T4093617/T4093617.java
+++ b/test/langtools/tools/javac/T4093617/T4093617.java
@@ -25,7 +25,6 @@
  * @test
  * @bug     4093617
  * @summary Object has no superclass
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/module=java.base/fail/ref=T4093617.out -XDrawDiagnostics java/lang/Object.java
  */
-
diff --git a/test/langtools/tools/javac/T4848619/T4848619a.java b/test/langtools/tools/javac/T4848619/T4848619a.java
index 859c3b4e1f7bb..dd76ff1d4ddca 100644
--- a/test/langtools/tools/javac/T4848619/T4848619a.java
+++ b/test/langtools/tools/javac/T4848619/T4848619a.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     4848619
  * @summary static final variable declared after use and self initialized
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T4848619a.out -XDrawDiagnostics T4848619a.java
  */
 
diff --git a/test/langtools/tools/javac/T4848619/T4848619b.java b/test/langtools/tools/javac/T4848619/T4848619b.java
index b1677c6009174..1db063297960c 100644
--- a/test/langtools/tools/javac/T4848619/T4848619b.java
+++ b/test/langtools/tools/javac/T4848619/T4848619b.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     4848619
  * @summary static final variable declared after use and self initialized
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T4848619b.out -XDrawDiagnostics T4848619b.java
  */
 
diff --git a/test/langtools/tools/javac/T4994049/DeprecatedYES.java b/test/langtools/tools/javac/T4994049/DeprecatedYES.java
index ec59558dcc783..6812543d90440 100644
--- a/test/langtools/tools/javac/T4994049/DeprecatedYES.java
+++ b/test/langtools/tools/javac/T4994049/DeprecatedYES.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6229758
  * @summary deprecatedNOT! is
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -Xlint:deprecation DeprecatedYES.java
  * @compile/fail/ref=DeprecatedYES.out -XDrawDiagnostics -Werror -Xlint:deprecation DeprecatedYES.java
  */
diff --git a/test/langtools/tools/javac/T4994049/T4994049.java b/test/langtools/tools/javac/T4994049/T4994049.java
index efbddd2da388f..1886b989b9b0c 100644
--- a/test/langtools/tools/javac/T4994049/T4994049.java
+++ b/test/langtools/tools/javac/T4994049/T4994049.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     4994049
  * @summary Improved diagnostics while parsing enums
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T4994049.out -XDrawDiagnostics T4994049.java
  */
 
diff --git a/test/langtools/tools/javac/T5003235/T5003235a.java b/test/langtools/tools/javac/T5003235/T5003235a.java
index 3a14d960f5d3a..c146c964f69b2 100644
--- a/test/langtools/tools/javac/T5003235/T5003235a.java
+++ b/test/langtools/tools/javac/T5003235/T5003235a.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     5003235
  * @summary Private inner class accessible from subclasses
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5003235a.out -XDrawDiagnostics T5003235a.java
  */
 
diff --git a/test/langtools/tools/javac/T5003235/T5003235b.java b/test/langtools/tools/javac/T5003235/T5003235b.java
index 8cb9bdaf85f2d..5d129fe335a1f 100644
--- a/test/langtools/tools/javac/T5003235/T5003235b.java
+++ b/test/langtools/tools/javac/T5003235/T5003235b.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     5003235
  * @summary Accessibility of private inner class
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5003235b.out -XDrawDiagnostics T5003235b.java
  */
 
diff --git a/test/langtools/tools/javac/T5003235/T5003235c.java b/test/langtools/tools/javac/T5003235/T5003235c.java
index 991c63ac984c3..38c5145735290 100644
--- a/test/langtools/tools/javac/T5003235/T5003235c.java
+++ b/test/langtools/tools/javac/T5003235/T5003235c.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     5003235
  * @summary Access to private inner classes
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5003235c.out -XDrawDiagnostics T5003235c.java
  */
 
diff --git a/test/langtools/tools/javac/T5092545.java b/test/langtools/tools/javac/T5092545.java
index f56677ffc7af7..0191c789e6c1b 100644
--- a/test/langtools/tools/javac/T5092545.java
+++ b/test/langtools/tools/javac/T5092545.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5092545
  * @summary Assertion failed in javac (ClassWriter.java:513)
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 interface A { void g(); }
diff --git a/test/langtools/tools/javac/T5105890.java b/test/langtools/tools/javac/T5105890.java
index 867c5a73fb3bf..12e579a834928 100644
--- a/test/langtools/tools/javac/T5105890.java
+++ b/test/langtools/tools/javac/T5105890.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5105890
  * @summary (codegen) constant folding broken for conditional operator
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 public class T5105890 {
diff --git a/test/langtools/tools/javac/T6180021/AbstractSub.java b/test/langtools/tools/javac/T6180021/AbstractSub.java
index f5b28abf17f42..67334bdfc71fa 100644
--- a/test/langtools/tools/javac/T6180021/AbstractSub.java
+++ b/test/langtools/tools/javac/T6180021/AbstractSub.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6180021
  * @summary CompletionFailure during TypeTrans
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Super.java
  * @clean   Missing
  * @compile AbstractSub.java
diff --git a/test/langtools/tools/javac/T6180021/Sub.java b/test/langtools/tools/javac/T6180021/Sub.java
index c1ed3e9a704b5..3233b9a2bf035 100644
--- a/test/langtools/tools/javac/T6180021/Sub.java
+++ b/test/langtools/tools/javac/T6180021/Sub.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6180021
  * @summary CompletionFailure during TypeTrans
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Super.java
  * @clean   Missing
  * @compile Sub.java
diff --git a/test/langtools/tools/javac/T6231246/T6231246.java b/test/langtools/tools/javac/T6231246/T6231246.java
index c2d259ff10cfc..34835d9e454bf 100644
--- a/test/langtools/tools/javac/T6231246/T6231246.java
+++ b/test/langtools/tools/javac/T6231246/T6231246.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6231246
  * @summary Javac crash with -g:none
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -g:none T6231246.java
  */
 
diff --git a/test/langtools/tools/javac/T6231847.java b/test/langtools/tools/javac/T6231847.java
index 8d4ef4112e795..fa3102f9afd84 100644
--- a/test/langtools/tools/javac/T6231847.java
+++ b/test/langtools/tools/javac/T6231847.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6231847
  * @summary Crash in com.sun.tools.javac.comp.Attr.visitNewClass:1352
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6231847.out -XDdev -XDrawDiagnostics T6231847.java
  */
 
diff --git a/test/langtools/tools/javac/T6266772.java b/test/langtools/tools/javac/T6266772.java
index 8a5e5133766be..79ae48a28fc39 100644
--- a/test/langtools/tools/javac/T6266772.java
+++ b/test/langtools/tools/javac/T6266772.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6266772
  * @summary javac crashes, assertion failure in Lower.java
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 public class T6266772 {
diff --git a/test/langtools/tools/javac/T6407257.java b/test/langtools/tools/javac/T6407257.java
index 7d5da43cab04c..0b6b339fdc211 100644
--- a/test/langtools/tools/javac/T6407257.java
+++ b/test/langtools/tools/javac/T6407257.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6407257
  * @summary javac locks up when encountering cyclic inheritance
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6407257.out -XDrawDiagnostics T6407257.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java b/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java
index e13c537230daa..1f22cefa0cf4e 100644
--- a/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java
+++ b/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=NoAnnotationMethods.out -XDrawDiagnostics  NoAnnotationMethods.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/neg/NoClone.java b/test/langtools/tools/javac/annotations/neg/NoClone.java
index 13237fe91a7ee..8979ca1cdd0d4 100644
--- a/test/langtools/tools/javac/annotations/neg/NoClone.java
+++ b/test/langtools/tools/javac/annotations/neg/NoClone.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=NoClone.out -XDrawDiagnostics  NoClone.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java b/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java
index 8e4df05f7bd69..668aa8c47bde2 100644
--- a/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java
+++ b/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=NoObjectMethods.out -XDrawDiagnostics  NoObjectMethods.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
index c0f02bf1b82ea..129fe57b66722 100644
--- a/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
+++ b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile AnnotationMethods.java
  */
 
diff --git a/test/langtools/tools/javac/api/6400303/T6400303.java b/test/langtools/tools/javac/api/6400303/T6400303.java
index 06e9b419cfeb2..c3a01c007b303 100644
--- a/test/langtools/tools/javac/api/6400303/T6400303.java
+++ b/test/langtools/tools/javac/api/6400303/T6400303.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6400303
  * @summary REGRESSION: javadoc crashes in b75
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
  *          jdk.compiler/com.sun.tools.javac.comp
diff --git a/test/langtools/tools/javac/api/6410643/T6410643.java b/test/langtools/tools/javac/api/6410643/T6410643.java
index e15a52721524f..a551f802d62d5 100644
--- a/test/langtools/tools/javac/api/6410643/T6410643.java
+++ b/test/langtools/tools/javac/api/6410643/T6410643.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6410643
  * @summary JSR 199: The method JavaCompilerTool.run fails to handle null arguments
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6411310/T6411310.java b/test/langtools/tools/javac/api/6411310/T6411310.java
index 55945e61fbc00..2714117962f59 100644
--- a/test/langtools/tools/javac/api/6411310/T6411310.java
+++ b/test/langtools/tools/javac/api/6411310/T6411310.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6411310
  * @summary JSR 199: FileObject should support user-friendly names via getName()
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6411333/T6411333.java b/test/langtools/tools/javac/api/6411333/T6411333.java
index f33e6f63a28d8..837261439645b 100644
--- a/test/langtools/tools/javac/api/6411333/T6411333.java
+++ b/test/langtools/tools/javac/api/6411333/T6411333.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6411333 6400208 6400225 6400267
  * @summary Ensure 6400208, 6400225, and 6400267 are tested
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6412656/T6412656.java b/test/langtools/tools/javac/api/6412656/T6412656.java
index 0924d5df55e0f..b7976e036fd9a 100644
--- a/test/langtools/tools/javac/api/6412656/T6412656.java
+++ b/test/langtools/tools/javac/api/6412656/T6412656.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6412656 6443062
  * @summary JSR 199: pass annotation processor instances to compiler
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6415780/T6415780.java b/test/langtools/tools/javac/api/6415780/T6415780.java
index dc74aa96fb06f..99c0a476beea3 100644
--- a/test/langtools/tools/javac/api/6415780/T6415780.java
+++ b/test/langtools/tools/javac/api/6415780/T6415780.java
@@ -26,7 +26,7 @@
  * @bug     6415780
  * @summary JSR 199: javax.tools.JavaFileManager.getClassLoader always fails
  * @author  igor.tseytin@...
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6418694/T6418694.java b/test/langtools/tools/javac/api/6418694/T6418694.java
index 8eb237586b753..9e8ee8e850bcf 100644
--- a/test/langtools/tools/javac/api/6418694/T6418694.java
+++ b/test/langtools/tools/javac/api/6418694/T6418694.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6418694
  * @summary JSR 199: JavaFileManager.hasLocation(Location)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6420409/T6420409.java b/test/langtools/tools/javac/api/6420409/T6420409.java
index 60cfc4272d891..d12274f5f3b50 100644
--- a/test/langtools/tools/javac/api/6420409/T6420409.java
+++ b/test/langtools/tools/javac/api/6420409/T6420409.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6420409
  * @summary JSR 199: StandardFileManager: cannot set CLASS_PATH location
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/6421111/T6421111.java b/test/langtools/tools/javac/api/6421111/T6421111.java
index 699c771e38e35..9497e2ca22f84 100644
--- a/test/langtools/tools/javac/api/6421111/T6421111.java
+++ b/test/langtools/tools/javac/api/6421111/T6421111.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6421111
  * @summary NullPointerException thrown when retrieving bounds for the type parameter
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6421756/T6421756.java b/test/langtools/tools/javac/api/6421756/T6421756.java
index 9e2cfb8cbc856..00efff6971cdb 100644
--- a/test/langtools/tools/javac/api/6421756/T6421756.java
+++ b/test/langtools/tools/javac/api/6421756/T6421756.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6421756
  * @summary 6421756 JSR 199: In the method JavaCompilerTool.getTask 'options' can be supplied in the place of 'classes'
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6422215/T6422215.java b/test/langtools/tools/javac/api/6422215/T6422215.java
index 1c25a6e38da87..425d47616f0c8 100644
--- a/test/langtools/tools/javac/api/6422215/T6422215.java
+++ b/test/langtools/tools/javac/api/6422215/T6422215.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6422215
  * @summary JSR 199: What happens if a directory is missing
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6422327/T6422327.java b/test/langtools/tools/javac/api/6422327/T6422327.java
index 5029a199408d5..94a31101f16a6 100644
--- a/test/langtools/tools/javac/api/6422327/T6422327.java
+++ b/test/langtools/tools/javac/api/6422327/T6422327.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6422327
  * @summary JSR 199: JavaCompilerTool can compile and generate '.class' of non '.java' files
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6423003/T6423003.java b/test/langtools/tools/javac/api/6423003/T6423003.java
index 810789b93abf7..893f2dd634450 100644
--- a/test/langtools/tools/javac/api/6423003/T6423003.java
+++ b/test/langtools/tools/javac/api/6423003/T6423003.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6423003
  * @summary JSR 199: confusing help message with compiler API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6431257/T6431257.java b/test/langtools/tools/javac/api/6431257/T6431257.java
index 291d4222cc0f9..c772a3c129cbd 100644
--- a/test/langtools/tools/javac/api/6431257/T6431257.java
+++ b/test/langtools/tools/javac/api/6431257/T6431257.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6431257
  * @summary JSR 199: Changes to JavaFileManager to support JSR 269 Filer API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6437999/T6437999.java b/test/langtools/tools/javac/api/6437999/T6437999.java
index a44bd2b0d6af9..167c7feda118f 100644
--- a/test/langtools/tools/javac/api/6437999/T6437999.java
+++ b/test/langtools/tools/javac/api/6437999/T6437999.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6437999
  * @summary Unit test for encoding argument to standard file manager
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6440333/T6440333.java b/test/langtools/tools/javac/api/6440333/T6440333.java
index 21a1247a2b648..5da878273b35a 100644
--- a/test/langtools/tools/javac/api/6440333/T6440333.java
+++ b/test/langtools/tools/javac/api/6440333/T6440333.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6440333
  * @summary SimpleJavaFileObject.toString() generates URI with some extra message
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6440528/T6440528.java b/test/langtools/tools/javac/api/6440528/T6440528.java
index ef94ccb96a70d..3b72fd39255fa 100644
--- a/test/langtools/tools/javac/api/6440528/T6440528.java
+++ b/test/langtools/tools/javac/api/6440528/T6440528.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6440528
  * @summary javac deposits package-info.class in bogus directory
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler/com.sun.tools.javac.file
diff --git a/test/langtools/tools/javac/api/6452876/T6452876.java b/test/langtools/tools/javac/api/6452876/T6452876.java
index cab4f1185583e..49a25a3bd32cc 100644
--- a/test/langtools/tools/javac/api/6452876/T6452876.java
+++ b/test/langtools/tools/javac/api/6452876/T6452876.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6452876
  * @summary JSR 199: DiagnosticCollector.report(null) should throw NPE
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6468404/T6468404.java b/test/langtools/tools/javac/api/6468404/T6468404.java
index 14580a51be451..c06e37e84b85c 100644
--- a/test/langtools/tools/javac/api/6468404/T6468404.java
+++ b/test/langtools/tools/javac/api/6468404/T6468404.java
@@ -26,7 +26,7 @@
  * @bug     6468404
  * @summary ExecutableElement.getParameters() uses raw type for class loaded from -g bytecode
  * @author  jesse.glick@...
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6471599/Main.java b/test/langtools/tools/javac/api/6471599/Main.java
index 735cebb4beec5..fa66ecc51d3f7 100644
--- a/test/langtools/tools/javac/api/6471599/Main.java
+++ b/test/langtools/tools/javac/api/6471599/Main.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6471599
  * @summary Type of rhs cannot be obtained when assigning to erroneous symbol
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile Main.java
  * @run main Main
diff --git a/test/langtools/tools/javac/api/Sibling.java b/test/langtools/tools/javac/api/Sibling.java
index b19ba4be7b9fe..d70548caa6332 100644
--- a/test/langtools/tools/javac/api/Sibling.java
+++ b/test/langtools/tools/javac/api/Sibling.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6399602
  * @summary Verify that files are created relative to sibling
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6257235.java b/test/langtools/tools/javac/api/T6257235.java
index 2ced708aa5fe5..095d2e83d3bc4 100644
--- a/test/langtools/tools/javac/api/T6257235.java
+++ b/test/langtools/tools/javac/api/T6257235.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6257235
  * @summary setOption() and setExtendedOption() of JavacTool throws NullPointerException for undefined options
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6258271.java b/test/langtools/tools/javac/api/T6258271.java
index 1ceb4becfd686..2092f5825a07a 100644
--- a/test/langtools/tools/javac/api/T6258271.java
+++ b/test/langtools/tools/javac/api/T6258271.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6258271
  * @summary DiagnosticMessage exposes internal name __input
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6265137.java b/test/langtools/tools/javac/api/T6265137.java
index c004833963d67..2a8a1fcb9adca 100644
--- a/test/langtools/tools/javac/api/T6265137.java
+++ b/test/langtools/tools/javac/api/T6265137.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6265137
  * @summary setOption() and setExtendedOption() of JavacTool will throw exception for some defined options
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6306137.java b/test/langtools/tools/javac/api/T6306137.java
index 2a8a788230a62..fe443950e52e1 100644
--- a/test/langtools/tools/javac/api/T6306137.java
+++ b/test/langtools/tools/javac/api/T6306137.java
@@ -29,7 +29,7 @@
  *          jdk.compiler
  * @compile -encoding utf-8 T6306137.java
  * @run main T6306137
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 import java.io.File;
diff --git a/test/langtools/tools/javac/api/T6358786.java b/test/langtools/tools/javac/api/T6358786.java
index c3e91ccb617bd..f8ffb829b2a54 100644
--- a/test/langtools/tools/javac/api/T6358786.java
+++ b/test/langtools/tools/javac/api/T6358786.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6358786
  * @summary Doccomments are not returned from Tree API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  * @run main T6358786 T6358786.java
  */
diff --git a/test/langtools/tools/javac/api/T6397104.java b/test/langtools/tools/javac/api/T6397104.java
index 74b840fa6b7f8..7d63c322371fc 100644
--- a/test/langtools/tools/javac/api/T6397104.java
+++ b/test/langtools/tools/javac/api/T6397104.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6397104
  * @summary JSR 199: JavaFileManager.getFileForOutput should have sibling argument
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6400205.java b/test/langtools/tools/javac/api/T6400205.java
index 075ad74cc7c8a..a942e7c66244b 100644
--- a/test/langtools/tools/javac/api/T6400205.java
+++ b/test/langtools/tools/javac/api/T6400205.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6400205
  * @summary getClassLoader(location) returns null if getLocation(location) returns null
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6400207.java b/test/langtools/tools/javac/api/T6400207.java
index 7747553d21ee2..47bf297ce724b 100644
--- a/test/langtools/tools/javac/api/T6400207.java
+++ b/test/langtools/tools/javac/api/T6400207.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6400207
  * @summary JSR 199: JavaFileManager.list and unset location
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6407011.java b/test/langtools/tools/javac/api/T6407011.java
index d4420cc1623bd..9991efd1a5da4 100644
--- a/test/langtools/tools/javac/api/T6407011.java
+++ b/test/langtools/tools/javac/api/T6407011.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6407011 6407066
  * @summary javac crashes in b78 with NPE in JavacFileManager:293
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/TestEvalExpression.java b/test/langtools/tools/javac/api/TestEvalExpression.java
index e627191d8685b..41e61548d558d 100644
--- a/test/langtools/tools/javac/api/TestEvalExpression.java
+++ b/test/langtools/tools/javac/api/TestEvalExpression.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4164450
  * @summary JSR 199: Standard interface for Java compilers
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          java.desktop
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/TestGetSourceVersions.java b/test/langtools/tools/javac/api/TestGetSourceVersions.java
index caac5eb2a3dbc..26892eca0a1fa 100644
--- a/test/langtools/tools/javac/api/TestGetSourceVersions.java
+++ b/test/langtools/tools/javac/api/TestGetSourceVersions.java
@@ -26,7 +26,7 @@
  * @bug     6395981 6458819 7025784 8028543 8028544 8193291 8193292 8193292 8205393 8245585 8245585 8245585 8286034
  *          8296150 8306585 8319414 8330183 8342982
  * @summary JavaCompilerTool and Tool must specify version of JLS and JVMS
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  * @run main/fail TestGetSourceVersions
diff --git a/test/langtools/tools/javac/api/TestGetTree.java b/test/langtools/tools/javac/api/TestGetTree.java
index 524ad8a1fe249..545645a3541ad 100644
--- a/test/langtools/tools/javac/api/TestGetTree.java
+++ b/test/langtools/tools/javac/api/TestGetTree.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6344177 6392177
  * @summary Can't get tree from a top level class
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  * @compile TestGetTree.java
  * @compile -processor TestGetTree -proc:only TestGetTree.java
diff --git a/test/langtools/tools/javac/api/TestJavacTask.java b/test/langtools/tools/javac/api/TestJavacTask.java
index c17f7d0577716..2d86a732a419a 100644
--- a/test/langtools/tools/javac/api/TestJavacTask.java
+++ b/test/langtools/tools/javac/api/TestJavacTask.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4813736 8015073
  * @summary Provide a basic test of access to the Java Model from javac, and error messages
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  * @run main TestJavacTask TestJavacTask.java
  */
diff --git a/test/langtools/tools/javac/api/TestJavacTaskScanner.java b/test/langtools/tools/javac/api/TestJavacTaskScanner.java
index 0d09a81cd70a1..4f920d96fb0c6 100644
--- a/test/langtools/tools/javac/api/TestJavacTaskScanner.java
+++ b/test/langtools/tools/javac/api/TestJavacTaskScanner.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4813736 8013256
  * @summary Additional functionality test of task and JSR 269
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ./lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
diff --git a/test/langtools/tools/javac/api/TestOperators.java b/test/langtools/tools/javac/api/TestOperators.java
index 91d58bb36570d..99448e3e38983 100644
--- a/test/langtools/tools/javac/api/TestOperators.java
+++ b/test/langtools/tools/javac/api/TestOperators.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6338064 6346249 6340951 6392177
  * @summary Tree API: can't determine kind of operator
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestOperators
diff --git a/test/langtools/tools/javac/api/TestResolveIdent.java b/test/langtools/tools/javac/api/TestResolveIdent.java
index c72f652ce3e7a..d5f5a6bb93e18 100644
--- a/test/langtools/tools/javac/api/TestResolveIdent.java
+++ b/test/langtools/tools/javac/api/TestResolveIdent.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6374357 6308351
  * @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
  *          jdk.compiler/com.sun.tools.javac.comp
diff --git a/test/langtools/tools/javac/boxing/T5082929.java b/test/langtools/tools/javac/boxing/T5082929.java
index 07ea7a37776cd..0a4be48a89eb2 100644
--- a/test/langtools/tools/javac/boxing/T5082929.java
+++ b/test/langtools/tools/javac/boxing/T5082929.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5082929
  * @summary Comparing Float and Integer
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5082929.out -XDrawDiagnostics  T5082929.java
  */
 
diff --git a/test/langtools/tools/javac/boxing/T6348760.java b/test/langtools/tools/javac/boxing/T6348760.java
index 98b580fdb9076..010bcbfd324fd 100644
--- a/test/langtools/tools/javac/boxing/T6348760.java
+++ b/test/langtools/tools/javac/boxing/T6348760.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6348760
  * @summary crash: java.lang.AssertionError at com.sun.tools.javac.comp.Lower.abstractLval(Lower.java:1853)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @run main/othervm T6348760
  */
 
diff --git a/test/langtools/tools/javac/cast/5043020/T5043020.java b/test/langtools/tools/javac/cast/5043020/T5043020.java
index da561cef9f8dc..13152c57a6482 100644
--- a/test/langtools/tools/javac/cast/5043020/T5043020.java
+++ b/test/langtools/tools/javac/cast/5043020/T5043020.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5043020
  * @summary Spurious unchecked cast warning
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -Werror -Xlint:unchecked T5043020.java
  */
 
diff --git a/test/langtools/tools/javac/cast/6302214/T6302214a.java b/test/langtools/tools/javac/cast/6302214/T6302214a.java
index 605894f6bb0d6..eeb8735e4a469 100644
--- a/test/langtools/tools/javac/cast/6302214/T6302214a.java
+++ b/test/langtools/tools/javac/cast/6302214/T6302214a.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6302214
  * @summary erroneus "inconvertible types" error
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -Xlint:unchecked -Werror T6302214a.java
  */
 
diff --git a/test/langtools/tools/javac/enum/6424358/T6424358.java b/test/langtools/tools/javac/enum/6424358/T6424358.java
index 9042f65264eef..6a5d403ada5d0 100644
--- a/test/langtools/tools/javac/enum/6424358/T6424358.java
+++ b/test/langtools/tools/javac/enum/6424358/T6424358.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6424358 7025809
  * @summary Synthesized static enum method values() is final
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/enum/NoFinal.java b/test/langtools/tools/javac/enum/NoFinal.java
index e48008e803f14..b6babaf9ac9cd 100644
--- a/test/langtools/tools/javac/enum/NoFinal.java
+++ b/test/langtools/tools/javac/enum/NoFinal.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal.out -XDrawDiagnostics  NoFinal.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal2.java b/test/langtools/tools/javac/enum/NoFinal2.java
index 1c69e0c1e516f..372cb7bbab29b 100644
--- a/test/langtools/tools/javac/enum/NoFinal2.java
+++ b/test/langtools/tools/javac/enum/NoFinal2.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal2.out -XDrawDiagnostics  NoFinal2.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal3.java b/test/langtools/tools/javac/enum/NoFinal3.java
index 742ad4276f7ff..114fe3f2304c1 100644
--- a/test/langtools/tools/javac/enum/NoFinal3.java
+++ b/test/langtools/tools/javac/enum/NoFinal3.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal3.out -XDrawDiagnostics  NoFinal3.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal4.java b/test/langtools/tools/javac/enum/NoFinal4.java
index ee382d3b78e7a..35d325eeeae74 100644
--- a/test/langtools/tools/javac/enum/NoFinal4.java
+++ b/test/langtools/tools/javac/enum/NoFinal4.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal4.out -XDrawDiagnostics  NoFinal4.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal5.java b/test/langtools/tools/javac/enum/NoFinal5.java
index 6ec5e7c0fccc0..c3f3f99813dc8 100644
--- a/test/langtools/tools/javac/enum/NoFinal5.java
+++ b/test/langtools/tools/javac/enum/NoFinal5.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal5.out -XDrawDiagnostics  NoFinal5.java
  */
 
diff --git a/test/langtools/tools/javac/enum/OkFinal.java b/test/langtools/tools/javac/enum/OkFinal.java
index 4f6c2d63abe3f..a37de61ae5cb9 100644
--- a/test/langtools/tools/javac/enum/OkFinal.java
+++ b/test/langtools/tools/javac/enum/OkFinal.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5097250
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 public enum OkFinal {
diff --git a/test/langtools/tools/javac/enum/T5075242.java b/test/langtools/tools/javac/enum/T5075242.java
index 33cf45783da9b..29e90bd39fda2 100644
--- a/test/langtools/tools/javac/enum/T5075242.java
+++ b/test/langtools/tools/javac/enum/T5075242.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5075242
  * @summary Cannot make compound type involving Enums
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile T5075242.java
  */
diff --git a/test/langtools/tools/javac/enum/T5081785.java b/test/langtools/tools/javac/enum/T5081785.java
index 25d40bf5e4ace..d4e08431e9754 100644
--- a/test/langtools/tools/javac/enum/T5081785.java
+++ b/test/langtools/tools/javac/enum/T5081785.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5081785
  * @summary enums should be allowed in non-static contexts
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=T5081785.out -XDrawDiagnostics --release 15 T5081785.java
  * @compile T5081785.java
  */
diff --git a/test/langtools/tools/javac/enum/forwardRef/T6425594.java b/test/langtools/tools/javac/enum/forwardRef/T6425594.java
index e7a5bc177badb..26613735e7045 100644
--- a/test/langtools/tools/javac/enum/forwardRef/T6425594.java
+++ b/test/langtools/tools/javac/enum/forwardRef/T6425594.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     6424491
  * @summary javac accepts illegal forward references
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6425594.out -XDrawDiagnostics -XDuseBeforeDeclarationWarning T6425594.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java
index 737ed620eff4b..658ea56dbc7f3 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum1.out -XDrawDiagnostics  TestEnum1.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java
index cae8d1e8286c8..16b5ef9e57ffa 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum2.out -XDrawDiagnostics  TestEnum2.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java
index 2e22fd5552b91..497d4644d4025 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum3.out -XDrawDiagnostics  TestEnum3.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java
index 5b863302db0e5..6acfc3ead5fe9 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum4.out -XDrawDiagnostics  TestEnum4.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java
index 36928c1ef5fb8..35ae7244daa90 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum5.out -XDrawDiagnostics  TestEnum5.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java
index ccf003d1694da..305a38559fd7e 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6424491
  * @summary Cannot initialise nested enums
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum6.out -XDrawDiagnostics  TestEnum6.java
  */
 
diff --git a/test/langtools/tools/javac/generics/5086027/T5086027.java b/test/langtools/tools/javac/generics/5086027/T5086027.java
index 631550ad7a101..4d6902890beb3 100644
--- a/test/langtools/tools/javac/generics/5086027/T5086027.java
+++ b/test/langtools/tools/javac/generics/5086027/T5086027.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5086027
  * @summary Inner class of generic class cannot extend Throwable
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5086027.out -XDrawDiagnostics  T5086027.java
  */
 
diff --git a/test/langtools/tools/javac/generics/5086027/T5086027pos.java b/test/langtools/tools/javac/generics/5086027/T5086027pos.java
index 28e3d482b3d3d..e1b0037258012 100644
--- a/test/langtools/tools/javac/generics/5086027/T5086027pos.java
+++ b/test/langtools/tools/javac/generics/5086027/T5086027pos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5086027
  * @summary Inner class of generic class cannot extend Throwable
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T5086027pos.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6192945/Method.java b/test/langtools/tools/javac/generics/6192945/Method.java
index 9d81bfd2c92c1..0d3698ad75d1e 100644
--- a/test/langtools/tools/javac/generics/6192945/Method.java
+++ b/test/langtools/tools/javac/generics/6192945/Method.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6192945
  * @summary Declaration order of interdependent generic types should not matter
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Method.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6207386/Test.java b/test/langtools/tools/javac/generics/6207386/Test.java
index 7dcebc7511c8c..7725abb6ceb3a 100644
--- a/test/langtools/tools/javac/generics/6207386/Test.java
+++ b/test/langtools/tools/javac/generics/6207386/Test.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6207386
  * @summary Undecidable type system leads to crash
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Test.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6227936/T6227936.java b/test/langtools/tools/javac/generics/6227936/T6227936.java
index 2e0f0b7dc81c0..8a9b32261a5d3 100644
--- a/test/langtools/tools/javac/generics/6227936/T6227936.java
+++ b/test/langtools/tools/javac/generics/6227936/T6227936.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6227936
  * @summary Wrong type of inherited method using specialized type parameter
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6227936.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6245699/T6245699c.java b/test/langtools/tools/javac/generics/6245699/T6245699c.java
index fc5f22995874c..5105684a7c230 100644
--- a/test/langtools/tools/javac/generics/6245699/T6245699c.java
+++ b/test/langtools/tools/javac/generics/6245699/T6245699c.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6245699
  * @summary Missing bridge for final method (gives AbstractMethodError at runtime)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 public class T6245699c {
diff --git a/test/langtools/tools/javac/generics/6292765/T6292765.java b/test/langtools/tools/javac/generics/6292765/T6292765.java
index 874ff4d02eaae..c58127f15f100 100644
--- a/test/langtools/tools/javac/generics/6292765/T6292765.java
+++ b/test/langtools/tools/javac/generics/6292765/T6292765.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6292765
  * @summary NPE at Check.checkCompatibleConcretes
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6292765.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6332204/T6332204.java b/test/langtools/tools/javac/generics/6332204/T6332204.java
index 8e70d592dda1f..6c61304cc6daf 100644
--- a/test/langtools/tools/javac/generics/6332204/T6332204.java
+++ b/test/langtools/tools/javac/generics/6332204/T6332204.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6332204
  * @summary com.sun.tools.javac.code.Types.lub() throws NPE
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6332204.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6413682/TestPos.java b/test/langtools/tools/javac/generics/6413682/TestPos.java
index 4df4d458cfd2c..1da09adc591f3 100644
--- a/test/langtools/tools/javac/generics/6413682/TestPos.java
+++ b/test/langtools/tools/javac/generics/6413682/TestPos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6413682
  * @summary Compiler confused about implicit type args and arrays
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  */
 
diff --git a/test/langtools/tools/javac/generics/T6391995.java b/test/langtools/tools/javac/generics/T6391995.java
index 6ff82f30cab01..ef01a6405b2da 100644
--- a/test/langtools/tools/javac/generics/T6391995.java
+++ b/test/langtools/tools/javac/generics/T6391995.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6391995
  * @summary removal of "rvalue conversion" causes problems
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile T6391995.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/5073060/Neg.java b/test/langtools/tools/javac/generics/inference/5073060/Neg.java
index 1658e29e23a8c..6a42c06239b70 100644
--- a/test/langtools/tools/javac/generics/inference/5073060/Neg.java
+++ b/test/langtools/tools/javac/generics/inference/5073060/Neg.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5073060
  * @summary Package private members not found for intersection types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg.out -XDrawDiagnostics NegHelper.java Neg.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
index 270daf1bfb770..be3364099b9e5 100644
--- a/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
+++ b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5073060
  * @summary Package private members not found for intersection types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 public class T5073060a {
diff --git a/test/langtools/tools/javac/generics/inference/5081782/Neg.java b/test/langtools/tools/javac/generics/inference/5081782/Neg.java
index eedee463f23a8..1ef3d22a5ccb1 100644
--- a/test/langtools/tools/javac/generics/inference/5081782/Neg.java
+++ b/test/langtools/tools/javac/generics/inference/5081782/Neg.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5081782
  * @summary type arguments to non-generic methods
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg.out -XDrawDiagnostics  Neg.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/5081782/Pos.java b/test/langtools/tools/javac/generics/inference/5081782/Pos.java
index 577f463c04c5a..5a0b3eb88eed7 100644
--- a/test/langtools/tools/javac/generics/inference/5081782/Pos.java
+++ b/test/langtools/tools/javac/generics/inference/5081782/Pos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5081782
  * @summary type arguments to non-generic methods
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Pos.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6215213/T6215213.java b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
index 6736f92ce7a94..98dd5ff1e3f45 100644
--- a/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
+++ b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6215213
  * @summary Compiler JDK1.5 crashes with uses of generics
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6215213.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6278587/T6278587.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
index 403ca2d63e64e..76d7bdb4e8b85 100644
--- a/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
+++ b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6278587
  * @summary Inference broken for subtypes of subtypes of F-bounded types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6278587.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java
index 3963c641fa3db..02dd1fe25ee4a 100644
--- a/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java
+++ b/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6278587 8007464
  * @summary Inference broken for subtypes of subtypes of F-bounded types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6278587Neg.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6302954/T6456971.java b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
index d3e195463ae97..03ba90132ae8e 100644
--- a/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
+++ b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6456971
  * @summary Varargs and inference problem
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6456971.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6359106/T6359106.java b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
index 73c077653116f..478cbf465c226 100644
--- a/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
+++ b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6359106
  * @summary Valid generics code does not compile
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Orig.java T6359106.java
  */
 
diff --git a/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
index 664dca0c8055e..c09dbdb29ffdc 100644
--- a/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
+++ b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
@@ -26,7 +26,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile -Xlint:unchecked -Werror AttributeSet.java
  */
diff --git a/test/langtools/tools/javac/generics/rawOverride/Fail1.java b/test/langtools/tools/javac/generics/rawOverride/Fail1.java
index 1b73b9742fb63..e93402d830ae8 100644
--- a/test/langtools/tools/javac/generics/rawOverride/Fail1.java
+++ b/test/langtools/tools/javac/generics/rawOverride/Fail1.java
@@ -3,7 +3,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile/fail/ref=Fail1.out -XDrawDiagnostics  Fail1.java
  */
diff --git a/test/langtools/tools/javac/generics/rawOverride/T6178365.java b/test/langtools/tools/javac/generics/rawOverride/T6178365.java
index dc3afc800efea..9a7a97c76aa47 100644
--- a/test/langtools/tools/javac/generics/rawOverride/T6178365.java
+++ b/test/langtools/tools/javac/generics/rawOverride/T6178365.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 6178365
  * @summary REGRESSION: Compile Error - Abstract error in LoginModule
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @run main T6178365
  */
 
diff --git a/test/langtools/tools/javac/generics/rawOverride/Warn1.java b/test/langtools/tools/javac/generics/rawOverride/Warn1.java
index e4fa90a893141..134a43ce4604e 100644
--- a/test/langtools/tools/javac/generics/rawOverride/Warn1.java
+++ b/test/langtools/tools/javac/generics/rawOverride/Warn1.java
@@ -3,7 +3,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile Warn1.java
  * @compile/fail/ref=Warn1.out -XDrawDiagnostics -Xlint:unchecked -Werror Warn1.java
diff --git a/test/langtools/tools/javac/generics/rawOverride/Warn2.java b/test/langtools/tools/javac/generics/rawOverride/Warn2.java
index e4bc3aff0d612..252dcaa32ebd9 100644
--- a/test/langtools/tools/javac/generics/rawOverride/Warn2.java
+++ b/test/langtools/tools/javac/generics/rawOverride/Warn2.java
@@ -3,7 +3,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile Warn2.java
  * @compile/fail/ref=Warn2.out -XDrawDiagnostics -Xlint:unchecked -Werror Warn2.java
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
index c90a2aacf5a20..ceac89e03978f 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile  T4856983.java
  */
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java
index ff722efe5c738..52a2c02ba8166 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=T4856983a.out -XDrawDiagnostics T4856983a.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java
index ba013aeaf6d98..beef177610551 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=T4856983b.out -XDrawDiagnostics T4856983b.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java
index 6564a37b3679f..228d7245eef77 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Compatibility.out -XDrawDiagnostics Compatibility.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Method.java b/test/langtools/tools/javac/generics/typevars/5060485/Method.java
index fc3121e1559bf..2603727b4118a 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Method.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Method.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Method.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java b/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java
index 380ef7501da9d..58a56c602ac41 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg1.out -XDrawDiagnostics  Neg1.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java b/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java
index c96080d177759..0ea9c2c7ef86e 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg2.out -XDrawDiagnostics  Neg2.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Pos.java b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
index 74017c2ef1633..29cc91f0c0404 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Pos.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java b/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java
index a7a9720467cc5..e2e51610d4e5c 100644
--- a/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java
+++ b/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 6182630
  * @summary Method with parameter bound to raw type avoids unchecked warning
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/ref=T6182630.out -XDrawDiagnostics -Xlint:unchecked T6182630.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java b/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java
index 5de2ae54da070..dfa0ce443a988 100644
--- a/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java
+++ b/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6486430
  * @summary Compiler fails to reject access to static member in parameterized type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6486430.out -XDrawDiagnostics  T6486430.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java b/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java
index 35056db6daa74..6b6941055a0e4 100644
--- a/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java
+++ b/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6486430
  * @summary Compiler fails to reject access to static member in parameterized type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6486430a.out -XDrawDiagnostics  T6486430a.java
  */
 
diff --git a/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
index 550efc2d54a86..db551e72b1ed7 100644
--- a/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
+++ b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6330931
  * @summary Super wildcard has incorrect upper bound
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6330931.java
  */
 
diff --git a/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
index e380be8832ae2..5e1233442c939 100644
--- a/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
+++ b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
@@ -3,7 +3,7 @@
  * @bug     6437894
  * @summary Javac throws a NullPointerException
  * @author  jan.lahoda@...
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile A.java B.java
  * @clean   a.A
  * @compile/fail/ref=T6437894.out -XDrawDiagnostics T6437894.java
diff --git a/test/langtools/tools/javac/generics/wildcards/T5097548.java b/test/langtools/tools/javac/generics/wildcards/T5097548.java
index b8b074fcfd293..46459ffa67580 100644
--- a/test/langtools/tools/javac/generics/wildcards/T5097548.java
+++ b/test/langtools/tools/javac/generics/wildcards/T5097548.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5097548
  * @summary (crash) Stack overflow in capture conversion
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile  T5097548.java
  * @run main T5097548
  */
diff --git a/test/langtools/tools/javac/generics/wildcards/T5097548b.java b/test/langtools/tools/javac/generics/wildcards/T5097548b.java
index d5c1b6586be89..2ce974fb2ca02 100644
--- a/test/langtools/tools/javac/generics/wildcards/T5097548b.java
+++ b/test/langtools/tools/javac/generics/wildcards/T5097548b.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5097548
  * @summary Stack overflow in capture conversion
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile  T5097548b.java
  */
 
diff --git a/test/langtools/tools/javac/jvm/6397652/T6397652.java b/test/langtools/tools/javac/jvm/6397652/T6397652.java
index f134ed08dfa78..3b6c78f4ed5fa 100644
--- a/test/langtools/tools/javac/jvm/6397652/T6397652.java
+++ b/test/langtools/tools/javac/jvm/6397652/T6397652.java
@@ -26,7 +26,7 @@
  * @bug     6397652
  * @summary javac compilation failure when imported class with $ sign in the name
  * @author  Yuri Gaevsky
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile com/test/Test.java com/test/Test$Test.java com/test/Test$Test$Test.java
  * @compile T6397652.java
  */
diff --git a/test/langtools/tools/javac/nested/5009484/Y.java b/test/langtools/tools/javac/nested/5009484/Y.java
index d56309737ae6e..98c4b20edec64 100644
--- a/test/langtools/tools/javac/nested/5009484/Y.java
+++ b/test/langtools/tools/javac/nested/5009484/Y.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5009484
  * @summary Compiler fails to resolve appropriate type for outer member
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Y.out -XDrawDiagnostics  Y.java
  */
 
diff --git a/test/langtools/tools/javac/overload/T4494762.java b/test/langtools/tools/javac/overload/T4494762.java
index 5ca31ecb4f432..bc4c7c7ab6206 100644
--- a/test/langtools/tools/javac/overload/T4494762.java
+++ b/test/langtools/tools/javac/overload/T4494762.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4494762 6491939
  * @summary Request for Clarification of JLS 15.12.2.2
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T4494762.java
  */
 
diff --git a/test/langtools/tools/javac/positions/T6402077.java b/test/langtools/tools/javac/positions/T6402077.java
index 0fb3f89ee81de..66caa9c282e5a 100644
--- a/test/langtools/tools/javac/positions/T6402077.java
+++ b/test/langtools/tools/javac/positions/T6402077.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6402077
  * @summary Start position is wrong for package private constructors
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  */
 
diff --git a/test/langtools/tools/javac/positions/T6404194.java b/test/langtools/tools/javac/positions/T6404194.java
index 6b187f581982f..18b07ad8af17b 100644
--- a/test/langtools/tools/javac/positions/T6404194.java
+++ b/test/langtools/tools/javac/positions/T6404194.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6404194
  * @summary javac parser generates incorrect end position for annotations with parentheses.
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  */
 
diff --git a/test/langtools/tools/javac/processing/6359313/T6359313.java b/test/langtools/tools/javac/processing/6359313/T6359313.java
index 3d06d3ecfcb51..b3854099075bb 100644
--- a/test/langtools/tools/javac/processing/6359313/T6359313.java
+++ b/test/langtools/tools/javac/processing/6359313/T6359313.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6359313
  * @summary error compiling annotated package
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/processing/6413690/T6413690.java b/test/langtools/tools/javac/processing/6413690/T6413690.java
index f0a01d599efce..b0945991bd299 100644
--- a/test/langtools/tools/javac/processing/6413690/T6413690.java
+++ b/test/langtools/tools/javac/processing/6413690/T6413690.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6413690 6380018
  * @summary JavacProcessingEnvironment does not enter trees from preceding rounds
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/processing/model/6194785/T6194785.java b/test/langtools/tools/javac/processing/model/6194785/T6194785.java
index d053b9353ddb1..c8f09ba8c959e 100644
--- a/test/langtools/tools/javac/processing/model/6194785/T6194785.java
+++ b/test/langtools/tools/javac/processing/model/6194785/T6194785.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6194785
  * @summary ParameterDeclaration.getSimpleName does not return actual name from class files
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
index 8310a403b1450..4d35b9ae747d6 100644
--- a/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
+++ b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6374357 6308351 6707027
  * @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.model
  * @run main/othervm -Xmx512m Main
  */
diff --git a/test/langtools/tools/javac/processing/options/Xprint.java b/test/langtools/tools/javac/processing/options/Xprint.java
index adf6c20e1ed1d..51df77afef976 100644
--- a/test/langtools/tools/javac/processing/options/Xprint.java
+++ b/test/langtools/tools/javac/processing/options/Xprint.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6266828
  * @summary JSR 269: Java Language Model API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/scope/6225935/T6214959.java b/test/langtools/tools/javac/scope/6225935/T6214959.java
index 96a9478f33cfa..6130a04cc9611 100644
--- a/test/langtools/tools/javac/scope/6225935/T6214959.java
+++ b/test/langtools/tools/javac/scope/6225935/T6214959.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6214959
  * @summary Compiler fails to produce error message with ODD number of import static
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6214959.out -XDrawDiagnostics T6214959.java
  */
 
diff --git a/test/langtools/tools/javac/scope/6225935/T6225935.java b/test/langtools/tools/javac/scope/6225935/T6225935.java
index 4e6e5272c530a..555293ca03038 100644
--- a/test/langtools/tools/javac/scope/6225935/T6225935.java
+++ b/test/langtools/tools/javac/scope/6225935/T6225935.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6225935
  * @summary "import static" accessibility rules for symbols different for no reason
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile a/Private.java a/Named.java a/Star.java T6225935.java
  * @run main/othervm T6225935
  */
diff --git a/test/langtools/tools/javac/scope/6225935/T6381787.java b/test/langtools/tools/javac/scope/6225935/T6381787.java
index 1e989950d7511..7a658b9e5f894 100644
--- a/test/langtools/tools/javac/scope/6225935/T6381787.java
+++ b/test/langtools/tools/javac/scope/6225935/T6381787.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6381787
  * @summary Failing Japanese Calendar regression tests
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6381787.java
  */
 
diff --git a/test/langtools/tools/javac/scope/6225935/Test.java b/test/langtools/tools/javac/scope/6225935/Test.java
index a77c8eebd0c54..1efc260c1fc8c 100644
--- a/test/langtools/tools/javac/scope/6225935/Test.java
+++ b/test/langtools/tools/javac/scope/6225935/Test.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6381787
  * @summary Failing Japanese Calendar regression tests
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Test.java Bar.java Baz.java
  */
 
diff --git a/test/langtools/tools/javac/scope/6392998/T6392998.java b/test/langtools/tools/javac/scope/6392998/T6392998.java
index 82f188d639115..353d9d5623330 100644
--- a/test/langtools/tools/javac/scope/6392998/T6392998.java
+++ b/test/langtools/tools/javac/scope/6392998/T6392998.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6392998
  * @summary Mustang compiler throws AssertionError (beta2-b71 and higher)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6392998.java
  */
 
diff --git a/test/langtools/tools/javac/unicode/FirstChar.java b/test/langtools/tools/javac/unicode/FirstChar.java
index 9e7bf473907a6..261538ab91b66 100644
--- a/test/langtools/tools/javac/unicode/FirstChar.java
+++ b/test/langtools/tools/javac/unicode/FirstChar.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5099360
  * @summary allow unicode escape at start of program
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile FirstChar2.java
  * @run main FirstChar2
  */
diff --git a/test/langtools/tools/javac/unit/T6198196.java b/test/langtools/tools/javac/unit/T6198196.java
index 6c67c51358432..3c75cc34477b5 100644
--- a/test/langtools/tools/javac/unit/T6198196.java
+++ b/test/langtools/tools/javac/unit/T6198196.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6198196 6278523
  * @summary package-info.java: Weird compiler error
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
index 02f7161da03cc..7a96872f66383 100644
--- a/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
+++ b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6397652
  * @summary javac compilation failure when imported class with $ sign in the name
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
diff --git a/test/langtools/tools/javac/unit/util/list/AbstractList.java b/test/langtools/tools/javac/unit/util/list/AbstractList.java
index daf80486853c3..38cdd7c5e7863 100644
--- a/test/langtools/tools/javac/unit/util/list/AbstractList.java
+++ b/test/langtools/tools/javac/unit/util/list/AbstractList.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6320536
  * @summary com.sun.tools.javac.util.List.from(A[]) shouldn't be deprecated
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../..
  * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile ../../util/list/AbstractList.java
diff --git a/test/langtools/tools/javac/unit/util/list/FromArray.java b/test/langtools/tools/javac/unit/util/list/FromArray.java
index 5a4b05fce9399..eabdb71e14824 100644
--- a/test/langtools/tools/javac/unit/util/list/FromArray.java
+++ b/test/langtools/tools/javac/unit/util/list/FromArray.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6289436
  * @summary com.sun.tools.javac.util.List.from(A[]) shouldn't be deprecated
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../..
  * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile ../../util/list/FromArray.java
diff --git a/test/langtools/tools/javac/util/filemanager/TestName.java b/test/langtools/tools/javac/util/filemanager/TestName.java
index cb8c77dda93ec..23bb2b9c78105 100644
--- a/test/langtools/tools/javac/util/filemanager/TestName.java
+++ b/test/langtools/tools/javac/util/filemanager/TestName.java
@@ -26,7 +26,7 @@
  * @bug     6409829
  * @summary JSR 199: enforce the use of valid package and class names
  *                   in get{Java,}FileFor{Input,Output}
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.file
  */