diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/api/BCV.java b/src/main/java/the/bytecode/club/bytecodeviewer/api/BCV.java
index a8e6531c..03fc08aa 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/api/BCV.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/api/BCV.java
@@ -25,7 +25,7 @@ import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.compilers.Compiler;
 import the.bytecode.club.bytecodeviewer.compilers.AbstractCompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.EZInjection;
 import the.bytecode.club.bytecodeviewer.util.DialogUtils;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
@@ -369,7 +369,7 @@ public class BCV
      *
      * @return The wrapped Krakatau Decompiler instance
      */
-    public static InternalDecompiler getKrakatauDecompiler()
+    public static AbstractDecompiler getKrakatauDecompiler()
     {
         return Decompiler.KRAKATAU_DECOMPILER.getDecompiler();
     }
@@ -379,7 +379,7 @@ public class BCV
      *
      * @return The wrapped Procyon Decompiler instance
      */
-    public static InternalDecompiler getProcyonDecompiler()
+    public static AbstractDecompiler getProcyonDecompiler()
     {
         return Decompiler.PROCYON_DECOMPILER.getDecompiler();
     }
@@ -389,7 +389,7 @@ public class BCV
      *
      * @return The wrapped CFR Decompiler instance
      */
-    public static InternalDecompiler getCFRDecompiler()
+    public static AbstractDecompiler getCFRDecompiler()
     {
         return Decompiler.CFR_DECOMPILER.getDecompiler();
     }
@@ -399,7 +399,7 @@ public class BCV
      *
      * @return The wrapped FernFlower Decompiler instance
      */
-    public static InternalDecompiler getFernFlowerDecompiler()
+    public static AbstractDecompiler getFernFlowerDecompiler()
     {
         return Decompiler.FERNFLOWER_DECOMPILER.getDecompiler();
     }
@@ -409,7 +409,7 @@ public class BCV
      *
      * @return The wrapped Krakatau Disassembler instance
      */
-    public static InternalDecompiler getKrakatauDisassembler()
+    public static AbstractDecompiler getKrakatauDisassembler()
     {
         return Decompiler.KRAKATAU_DISASSEMBLER.getDecompiler();
     }
@@ -419,7 +419,7 @@ public class BCV
      *
      * @return The wrapped JD-GUI Decompiler instance
      */
-    public static InternalDecompiler getDJGUIDecompiler()
+    public static AbstractDecompiler getDJGUIDecompiler()
     {
         return Decompiler.JD_DECOMPILER.getDecompiler();
     }
@@ -429,7 +429,7 @@ public class BCV
      *
      * @return The wrapped JADX Decompiler instance
      */
-    public static InternalDecompiler getJADXDecompiler()
+    public static AbstractDecompiler getJADXDecompiler()
     {
         return Decompiler.JADX_DECOMPILER.getDecompiler();
     }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/InternalDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/AbstractDecompiler.java
similarity index 97%
rename from src/main/java/the/bytecode/club/bytecodeviewer/decompilers/InternalDecompiler.java
rename to src/main/java/the/bytecode/club/bytecodeviewer/decompilers/AbstractDecompiler.java
index 5cba6872..02edd3e0 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/InternalDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/AbstractDecompiler.java
@@ -25,7 +25,7 @@ import org.objectweb.asm.tree.ClassNode;
  *
  * @author Konloch
  */
-public abstract class InternalDecompiler
+public abstract class AbstractDecompiler
 {
     public abstract String decompileClassNode(ClassNode cn, byte[] bytes);
 
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/Decompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/Decompiler.java
index abaf58ba..faef7c88 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/Decompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/Decompiler.java
@@ -49,9 +49,9 @@ public enum Decompiler
 
     private final String decompilerName;
     private final String decompilerNameProgrammic;
-    private final InternalDecompiler decompiler;
+    private final AbstractDecompiler decompiler;
 
-    Decompiler(String decompilerName, String decompilerNameProgrammic, InternalDecompiler decompiler)
+    Decompiler(String decompilerName, String decompilerNameProgrammic, AbstractDecompiler decompiler)
     {
         this.decompilerName = decompilerName;
         this.decompilerNameProgrammic = decompilerNameProgrammic;
@@ -68,7 +68,7 @@ public enum Decompiler
         return decompilerNameProgrammic;
     }
 
-    public InternalDecompiler getDecompiler()
+    public AbstractDecompiler getDecompiler()
     {
         return decompiler;
     }
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMTextifierDisassembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMTextifierDisassembler.java
index 28249ef1..8cdd10a5 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMTextifierDisassembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMTextifierDisassembler.java
@@ -21,7 +21,7 @@ package the.bytecode.club.bytecodeviewer.decompilers.impl;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.util.Textifier;
 import org.objectweb.asm.util.TraceClassVisitor;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -31,7 +31,7 @@ import java.io.StringWriter;
  *
  * @author Thiakil
  */
-public class ASMTextifierDisassembler extends InternalDecompiler
+public class ASMTextifierDisassembler extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMifierGenerator.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMifierGenerator.java
index 578d8525..fc6a9c3d 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMifierGenerator.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ASMifierGenerator.java
@@ -21,7 +21,7 @@ package the.bytecode.club.bytecodeviewer.decompilers.impl;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.util.ASMifier;
 import org.objectweb.asm.util.TraceClassVisitor;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -31,7 +31,7 @@ import java.io.StringWriter;
  *
  * @author Nick Botticelli
  */
-public class ASMifierGenerator extends InternalDecompiler
+public class ASMifierGenerator extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/BytecodeDisassembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/BytecodeDisassembler.java
index 53ed17ca..9f700e49 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/BytecodeDisassembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/BytecodeDisassembler.java
@@ -19,7 +19,7 @@
 package the.bytecode.club.bytecodeviewer.decompilers.impl;
 
 import org.objectweb.asm.tree.ClassNode;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.bytecode.ClassNodeDecompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.bytecode.PrefixedStringBuilder;
 
@@ -29,7 +29,7 @@ import java.util.ArrayList;
  * @author Konloch
  * @since 7/3/2021
  */
-public class BytecodeDisassembler extends InternalDecompiler
+public class BytecodeDisassembler extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java
index 0c85d98a..e9feb323 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java
@@ -30,7 +30,7 @@ import org.benf.cfr.reader.util.getopt.OptionsImpl;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
@@ -53,7 +53,7 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERR
  * @author GraxCode
  * Taken mostly out of Threadtear.
  */
-public class CFRDecompiler extends InternalDecompiler
+public class CFRDecompiler extends AbstractDecompiler
 {
 
     private static final String CLASS_SUFFIX = ".class";
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java
index 2187e2e2..48f9f5ad 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java
@@ -22,7 +22,7 @@ import me.konloch.kontainer.io.DiskReader;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
@@ -39,7 +39,7 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.FER
  * @author WaterWolf
  * @since 09/26/2011
  */
-public class FernFlowerDecompiler extends InternalDecompiler
+public class FernFlowerDecompiler extends AbstractDecompiler
 {
     @Override
     public void decompileToZip(String sourceJar, String zipName)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java
index c69a3535..fe787ce0 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java
@@ -24,12 +24,11 @@ import me.konloch.kontainer.io.DiskReader;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
 import java.io.*;
-import java.util.Random;
 
 import static the.bytecode.club.bytecodeviewer.Constants.*;
 import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
@@ -40,7 +39,7 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.JAD
  *
  * @author Konloch
  */
-public class JADXDecompiler extends InternalDecompiler
+public class JADXDecompiler extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JDGUIDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JDGUIDecompiler.java
index 13af2a4f..babe84f3 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JDGUIDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JDGUIDecompiler.java
@@ -24,7 +24,7 @@ import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.jdgui.CommonPreferences;
 import the.bytecode.club.bytecodeviewer.decompilers.jdgui.DirectoryLoader;
 import the.bytecode.club.bytecodeviewer.decompilers.jdgui.JDGUIClassFileUtil;
@@ -46,7 +46,7 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.JDG
  * @author JD-Core developers
  */
 
-public class JDGUIDecompiler extends InternalDecompiler
+public class JDGUIDecompiler extends AbstractDecompiler
 {
 
     @Override
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JavapDisassembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JavapDisassembler.java
index 90c300b4..5fcc61c7 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JavapDisassembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JavapDisassembler.java
@@ -23,7 +23,7 @@ import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.Constants;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.gui.components.JFrameConsolePrintStream;
 import the.bytecode.club.bytecodeviewer.resources.ExternalResources;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
@@ -46,7 +46,7 @@ import static the.bytecode.club.bytecodeviewer.api.ExceptionUI.SEND_STACKTRACE_T
  * @since 07/11/2021
  */
 
-public class JavapDisassembler extends InternalDecompiler
+public class JavapDisassembler extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDecompiler.java
index 902c4c88..967bc2b3 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDecompiler.java
@@ -25,7 +25,7 @@ import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.resources.ExternalResources;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
@@ -44,7 +44,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.*;
  * @author Konloch
  */
 
-public class KrakatauDecompiler extends InternalDecompiler
+public class KrakatauDecompiler extends AbstractDecompiler
 {
     public String buildCLIArguments()
     {
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDisassembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDisassembler.java
index da42c690..adabb103 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDisassembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDisassembler.java
@@ -25,7 +25,7 @@ import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.resources.ExternalResources;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
@@ -42,7 +42,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.*;
  * @author Konloch
  */
 
-public class KrakatauDisassembler extends InternalDecompiler
+public class KrakatauDisassembler extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ProcyonDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ProcyonDecompiler.java
index a125fd46..1bce478c 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ProcyonDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ProcyonDecompiler.java
@@ -28,7 +28,7 @@ import com.strobel.decompiler.languages.java.JavaFormattingOptions;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
@@ -50,7 +50,7 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.PRO
  * @author Konloch
  * @author DeathMarine
  */
-public class ProcyonDecompiler extends InternalDecompiler
+public class ProcyonDecompiler extends AbstractDecompiler
 {
 
     public DecompilerSettings getDecompilerSettings()
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java
index 66c8c12a..04916ad0 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java
@@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.AbstractDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.Dex2Jar;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
@@ -41,7 +41,7 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
  * @author Konloch
  */
 
-public class SmaliDisassembler extends InternalDecompiler
+public class SmaliDisassembler extends AbstractDecompiler
 {
     @Override
     public String decompileClassNode(ClassNode cn, byte[] bytes)