diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
index e2803516c..65912fc96 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
@@ -21,7 +21,7 @@ import com.jpexs.decompiler.flash.action.ActionList;
 import com.jpexs.decompiler.flash.action.ActionListReader;
 import com.jpexs.decompiler.flash.action.parser.ActionParseException;
 import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
-import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
+import com.jpexs.decompiler.flash.action.parser.script.ActionScript2Parser;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
@@ -54,7 +54,7 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase {
     }
 
     private String recompile(String str) throws ActionParseException, IOException, CompilationException, InterruptedException, TimeoutException {
-        ActionScriptParser par = new ActionScriptParser(SWF.DEFAULT_VERSION);
+        ActionScript2Parser par = new ActionScript2Parser(SWF.DEFAULT_VERSION);
         HighlightedTextWriter writer = new HighlightedTextWriter(new CodeFormatting(), false);
         List<Action> actions = par.actionsFromString(str);
         byte[] hex = Action.actionsToBytes(actions, true, SWF.DEFAULT_VERSION);
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ParserTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ParserTest.java
index 4ee6bc959..946b2644b 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ParserTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ParserTest.java
@@ -16,7 +16,7 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
+import com.jpexs.decompiler.flash.action.parser.script.ActionScript2Parser;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.graph.CompilationException;
 import java.io.IOException;
@@ -38,7 +38,7 @@ public class ActionScript2ParserTest extends ActionStript2TestBase {
 
     private void parseAS2(String script) {
         try {
-            ActionScriptParser par = new ActionScriptParser(SWF.DEFAULT_VERSION);
+            ActionScript2Parser par = new ActionScript2Parser(SWF.DEFAULT_VERSION);
             par.actionsFromString(script);
         } catch (IOException | CompilationException | ParseException ex) {
             fail("Unable to parse: " + script, ex);
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
index 0e46ea76b..41aee2382 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
@@ -19,9 +19,10 @@ package com.jpexs.decompiler.flash;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
+import com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScript3Parser;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.parser.ActionParseException;
-import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser;
+import com.jpexs.decompiler.flash.action.parser.script.ActionScript2Parser;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.CodeFormatting;
@@ -86,7 +87,7 @@ public class DirectEditingTest extends FileTestBase {
                         System.out.println("Recompiling:" + classPathString + "...");
                         en.toSource(htw, abc.script_info.get(s).traits.traits, ScriptExportMode.AS, false);
                         String original = htw.toString();
-                        com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScriptParser.compile(original, abc, allAbcs, false, en.getClassPath().className + ".as", abc.instance_info.size());
+                        ActionScript3Parser.compile(original, abc, allAbcs, false, en.getClassPath().className + ".as", abc.instance_info.size());
 
                         //remove last compiled script:
                         abc.script_info.remove(abc.script_info.size() - 1);
@@ -101,7 +102,7 @@ public class DirectEditingTest extends FileTestBase {
                         Action.actionsToSource(asm, asm.getActions(), asm.toString()/*FIXME?*/, writer);
                         String as = writer.toString();
                         as = asm.removePrefixAndSuffix(as);
-                        ActionScriptParser par = new ActionScriptParser(swf.version);
+                        ActionScript2Parser par = new ActionScript2Parser(swf.version);
                         try {
                             asm.setActions(par.actionsFromString(as));
                         } catch (ActionParseException | CompilationException ex) {