diff --git a/plugins/java-decompiler/engine/testData/classes/pkg/TestStaticNameClash.class b/plugins/java-decompiler/engine/testData/classes/pkg/TestStaticNameClash.class
index 16a1da3eaa4b..1573836f0fc8 100644
Binary files a/plugins/java-decompiler/engine/testData/classes/pkg/TestStaticNameClash.class and b/plugins/java-decompiler/engine/testData/classes/pkg/TestStaticNameClash.class differ
diff --git a/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Assigner.class b/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Assigner.class
index 4ebd715b0d13..a089dba7e5be 100644
Binary files a/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Assigner.class and b/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Assigner.class differ
diff --git a/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Incrementer.class b/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Incrementer.class
index d446c62ee10c..d592c3413e4a 100644
Binary files a/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Incrementer.class and b/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess$Incrementer.class differ
diff --git a/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess.class b/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess.class
index 364ce33cc273..9e3f5eb42703 100644
Binary files a/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess.class and b/plugins/java-decompiler/engine/testData/classes/pkg/TestSyntheticAccess.class differ
diff --git a/plugins/java-decompiler/engine/testData/results/TestStaticNameClash.dec b/plugins/java-decompiler/engine/testData/results/TestStaticNameClash.dec
index b01049cc1577..230983e8b304 100644
--- a/plugins/java-decompiler/engine/testData/results/TestStaticNameClash.dec
+++ b/plugins/java-decompiler/engine/testData/results/TestStaticNameClash.dec
@@ -3,9 +3,9 @@ package pkg;
 public class TestStaticNameClash {
    public static String property;
 
-   public static void setProperty(String property) {
-      TestStaticNameClash.property = property;// 12
-   }// 13
+   public static void setProperty(String var0) {
+      property = var0;// 8
+   }// 9
 }
 
 class 'pkg/TestStaticNameClash' {
@@ -16,5 +16,5 @@ class 'pkg/TestStaticNameClash' {
 }
 
 Lines mapping:
-12 <-> 7
-13 <-> 8
+8 <-> 7
+9 <-> 8
diff --git a/plugins/java-decompiler/engine/testData/results/TestSyntheticAccess.dec b/plugins/java-decompiler/engine/testData/results/TestSyntheticAccess.dec
index ef400d763dea..9f1c0ee951e1 100644
--- a/plugins/java-decompiler/engine/testData/results/TestSyntheticAccess.dec
+++ b/plugins/java-decompiler/engine/testData/results/TestSyntheticAccess.dec
@@ -6,34 +6,34 @@ class TestSyntheticAccess {
 
    private class Assigner {
       void assignI(int var1) {
-         TestSyntheticAccess.this.i = var1;// 36
-      }// 37
+         TestSyntheticAccess.this.i = var1;// 32
+      }// 33
 
       void assignS(int var1) {
-         TestSyntheticAccess.s = var1;// 40
-      }// 41
+         TestSyntheticAccess.s = var1;// 36
+      }// 37
    }
 
    private class Incrementer {
       void orI() {
-         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 14
-      }// 15
+         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 10
+      }// 11
 
       void incrementI() {
-         TestSyntheticAccess.this.i++;// 18
-      }// 19
+         TestSyntheticAccess.this.i++;// 14
+      }// 15
 
       void decrementI() {
-         --TestSyntheticAccess.this.i;// 22
-      }// 23
+         --TestSyntheticAccess.this.i;// 18
+      }// 19
 
       void incrementS() {
-         ++TestSyntheticAccess.s;// 26 27
+         ++TestSyntheticAccess.s;// 22 23
       }
 
       void decrementS() {
-         TestSyntheticAccess.s--;// 30
-      }// 31
+         TestSyntheticAccess.s--;// 26
+      }// 27
    }
 }
 
@@ -83,17 +83,17 @@ class 'pkg/TestSyntheticAccess$Incrementer' {
 }
 
 Lines mapping:
-14 <-> 19
-15 <-> 20
-18 <-> 23
-19 <-> 24
-22 <-> 27
-23 <-> 28
-26 <-> 31
-27 <-> 31
-30 <-> 35
-31 <-> 36
-36 <-> 9
-37 <-> 10
-40 <-> 13
-41 <-> 14
+10 <-> 19
+11 <-> 20
+14 <-> 23
+15 <-> 24
+18 <-> 27
+19 <-> 28
+22 <-> 31
+23 <-> 31
+26 <-> 35
+27 <-> 36
+32 <-> 9
+33 <-> 10
+36 <-> 13
+37 <-> 14
diff --git a/plugins/java-decompiler/engine/testData/src/pkg/TestStaticNameClash.java b/plugins/java-decompiler/engine/testData/src/pkg/TestStaticNameClash.java
index ced8f12bb3e0..5f5a08f33da2 100644
--- a/plugins/java-decompiler/engine/testData/src/pkg/TestStaticNameClash.java
+++ b/plugins/java-decompiler/engine/testData/src/pkg/TestStaticNameClash.java
@@ -1,9 +1,5 @@
 package pkg;
 
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 07, 2016
- */
 public class TestStaticNameClash {
 
     public static String property;
diff --git a/plugins/java-decompiler/engine/testData/src/pkg/TestSyntheticAccess.java b/plugins/java-decompiler/engine/testData/src/pkg/TestSyntheticAccess.java
index 0c4e3ea9e068..5ef41e8390b3 100644
--- a/plugins/java-decompiler/engine/testData/src/pkg/TestSyntheticAccess.java
+++ b/plugins/java-decompiler/engine/testData/src/pkg/TestSyntheticAccess.java
@@ -1,9 +1,5 @@
 package pkg;
 
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 20, 2016
- */
 class TestSyntheticAccess {
 
   private static int s;