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 20eade30e..899db6ae1 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 5330639a5..905236454 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 e68373bda..9c9813836 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 9edd350d0..2e0c57445 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 6b7ce45b3..6458b9dff 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 e6ba28a88..6b2cc4cb2 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 a938b64a3..c856e9366 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) {
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStreamTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStreamTest.java
index 7a83cb0a5..8b23694cc 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStreamTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/amf/amf3/Amf3InputStreamTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
 public class Amf3InputStreamTest {
 
     private FileInputStream fis;
-    private AMF3InputStream is;
+    private Amf3InputStream is;
 
     @AfterTest
     public void deinitStream() {
@@ -45,7 +45,7 @@ public class Amf3InputStreamTest {
 
     private void initStream(String fileName) throws FileNotFoundException {
         fis = new FileInputStream("testdata/amf3/generated/" + fileName);
-        is = new AMF3InputStream(fis);
+        is = new Amf3InputStream(fis);
     }
 
     @Test
@@ -165,7 +165,7 @@ public class Amf3InputStreamTest {
     @Test(expectedExceptions = UnsupportedValueType.class)
     public void testUnsupportedMarker() throws IOException, NoSerializerExistsException {
         final int UNSUPPORTED_MARKER = 100;
-        is = new AMF3InputStream(new ByteArrayInputStream(new byte[]{UNSUPPORTED_MARKER}));
+        is = new Amf3InputStream(new ByteArrayInputStream(new byte[]{UNSUPPORTED_MARKER}));
         is.readValue();
     }
 }