diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3InputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStream_.java
similarity index 99%
rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3InputStream.java
rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStream_.java
index e230c269f..1ccce3d7b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3InputStream.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStream_.java
@@ -22,12 +22,12 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class AMF3InputStream extends InputStream {
+public class Amf3InputStream_ extends InputStream {
 
-    public final static Logger LOGGER = Logger.getLogger(AMF3InputStream.class.getName());
+    public final static Logger LOGGER = Logger.getLogger(Amf3InputStream_.class.getName());
     private final InputStream is;
 
-    public AMF3InputStream(InputStream is) {
+    public Amf3InputStream_(InputStream is) {
         this.is = is;
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3OutputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3OutputStream_.java
similarity index 95%
rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3OutputStream.java
rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3OutputStream_.java
index 0c93ce193..75e54113c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3OutputStream.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3OutputStream_.java
@@ -3,11 +3,11 @@ package com.jpexs.decompiler.flash.amf.amf3;
 import java.io.IOException;
 import java.io.OutputStream;
 
-public class AMF3OutputStream extends OutputStream {
+public class Amf3OutputStream_ extends OutputStream {
 
     private final OutputStream os;
 
-    public AMF3OutputStream(OutputStream os) {
+    public Amf3OutputStream_(OutputStream os) {
         this.os = os;
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3Tools.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3Tools_.java
similarity index 99%
rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3Tools.java
rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3Tools_.java
index c13a26114..20eade30e 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/AMF3Tools.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/Amf3Tools_.java
@@ -18,7 +18,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class AMF3Tools {
+public class Amf3Tools_ {
 
     /**
      * Converts AMF value to something human-readable.
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/AbstractVectorType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/AbstractVectorType.java
index ebdb1b2ad..5330639a5 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/AbstractVectorType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/AbstractVectorType.java
@@ -1,6 +1,6 @@
 package com.jpexs.decompiler.flash.amf.amf3.types;
 
-import com.jpexs.decompiler.flash.amf.amf3.AMF3Tools;
+import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
 import java.util.ArrayList;
 import java.util.List;
 import com.jpexs.decompiler.flash.amf.amf3.WithSubValues;
@@ -34,7 +34,7 @@ public abstract class AbstractVectorType<T> implements WithSubValues {
 
     @Override
     public String toString() {
-        return AMF3Tools.amfToString(this);
+        return Amf3Tools_.amfToString(this);
     }
 
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ArrayType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ArrayType.java
index a3caf7030..e68373bda 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ArrayType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ArrayType.java
@@ -1,6 +1,6 @@
 package com.jpexs.decompiler.flash.amf.amf3.types;
 
-import com.jpexs.decompiler.flash.amf.amf3.AMF3Tools;
+import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
 import com.jpexs.decompiler.flash.amf.amf3.Pair;
 import com.jpexs.helpers.Helper;
 import java.util.ArrayList;
@@ -27,7 +27,7 @@ public class ArrayType implements WithSubValues {
 
     @Override
     public String toString() {
-        return AMF3Tools.amfToString(this);
+        return Amf3Tools_.amfToString(this);
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ByteArrayType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ByteArrayType.java
index 93cedf228..9edd350d0 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ByteArrayType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ByteArrayType.java
@@ -1,6 +1,6 @@
 package com.jpexs.decompiler.flash.amf.amf3.types;
 
-import com.jpexs.decompiler.flash.amf.amf3.AMF3Tools;
+import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
 
 public class ByteArrayType {
 
@@ -16,7 +16,7 @@ public class ByteArrayType {
 
     @Override
     public String toString() {
-        return AMF3Tools.amfToString(this);
+        return Amf3Tools_.amfToString(this);
     }
 
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DateType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DateType.java
index 821a8a0cb..6b7ce45b3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DateType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DateType.java
@@ -1,6 +1,6 @@
 package com.jpexs.decompiler.flash.amf.amf3.types;
 
-import com.jpexs.decompiler.flash.amf.amf3.AMF3Tools;
+import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
 import java.util.Date;
 
 public class DateType {
@@ -21,7 +21,7 @@ public class DateType {
 
     @Override
     public String toString() {
-        return AMF3Tools.amfToString(this);
+        return Amf3Tools_.amfToString(this);
     }
 
     public Date toDate() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DictionaryType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DictionaryType.java
index 57155f719..e6ba28a88 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DictionaryType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/DictionaryType.java
@@ -1,6 +1,6 @@
 package com.jpexs.decompiler.flash.amf.amf3.types;
 
-import com.jpexs.decompiler.flash.amf.amf3.AMF3Tools;
+import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
 import com.jpexs.decompiler.flash.amf.amf3.Pair;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +32,7 @@ public class DictionaryType implements WithSubValues {
 
     @Override
     public String toString() {
-        return AMF3Tools.amfToString(this);
+        return Amf3Tools_.amfToString(this);
     }
 
     public boolean hasWeakKeys() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ObjectType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ObjectType.java
index 3e0dfb4cc..a938b64a3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ObjectType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/amf/amf3/types/ObjectType.java
@@ -1,6 +1,6 @@
 package com.jpexs.decompiler.flash.amf.amf3.types;
 
-import com.jpexs.decompiler.flash.amf.amf3.AMF3Tools;
+import com.jpexs.decompiler.flash.amf.amf3.Amf3Tools_;
 import com.jpexs.decompiler.flash.amf.amf3.Pair;
 import com.jpexs.helpers.Helper;
 import java.util.ArrayList;
@@ -94,7 +94,7 @@ public class ObjectType implements WithSubValues {
 
     @Override
     public String toString() {
-        return AMF3Tools.amfToString(this);
+        return Amf3Tools_.amfToString(this);
     }
 
     public void setSerializedData(byte[] serializedData) {