diff --git a/languages/c/src/main/java/de/jplag/c/CLanguage.java b/languages/c/src/main/java/de/jplag/c/CLanguage.java
index ba99dbf498..c55dbf60b3 100644
--- a/languages/c/src/main/java/de/jplag/c/CLanguage.java
+++ b/languages/c/src/main/java/de/jplag/c/CLanguage.java
@@ -12,6 +12,7 @@
 
 @MetaInfServices(de.jplag.Language.class)
 public class CLanguage implements Language {
+    private static final String NAME = "C";
     private static final String IDENTIFIER = "c";
 
     private final Scanner scanner; // c code is scanned not parsed
@@ -27,7 +28,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "C Scanner";
+        return NAME;
     }
 
     @Override
diff --git a/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java b/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
index c08e53dce1..b76dfc823e 100644
--- a/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
+++ b/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
@@ -10,6 +10,7 @@
  */
 @MetaInfServices(Language.class)
 public class CPPLanguage extends AbstractAntlrLanguage {
+    private static final String NAME = "C++";
     private static final String IDENTIFIER = "cpp";
 
     public CPPLanguage() {
@@ -23,7 +24,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "C++ Parser";
+        return NAME;
     }
 
     @Override
diff --git a/languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java b/languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java
index aeeb53728f..67d24c60aa 100644
--- a/languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java
+++ b/languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java
@@ -9,7 +9,7 @@
  */
 @MetaInfServices(de.jplag.Language.class)
 public class CSharpLanguage extends AbstractAntlrLanguage {
-    private static final String NAME = "C# 6 Parser";
+    private static final String NAME = "C#";
     private static final String IDENTIFIER = "csharp";
     private static final String[] FILE_ENDINGS = new String[] {".cs", ".CS"};
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
diff --git a/languages/golang/src/main/java/de/jplag/golang/GoLanguage.java b/languages/golang/src/main/java/de/jplag/golang/GoLanguage.java
index e14926b43e..cb2d08eace 100644
--- a/languages/golang/src/main/java/de/jplag/golang/GoLanguage.java
+++ b/languages/golang/src/main/java/de/jplag/golang/GoLanguage.java
@@ -6,7 +6,7 @@
 
 @MetaInfServices(de.jplag.Language.class)
 public class GoLanguage extends AbstractAntlrLanguage {
-    private static final String NAME = "Go Parser";
+    private static final String NAME = "Go";
     private static final String IDENTIFIER = "go";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
     private static final String[] FILE_EXTENSIONS = {".go"};
diff --git a/languages/java/src/main/java/de/jplag/java/JavaLanguage.java b/languages/java/src/main/java/de/jplag/java/JavaLanguage.java
index a941dda67f..79d32f502c 100644
--- a/languages/java/src/main/java/de/jplag/java/JavaLanguage.java
+++ b/languages/java/src/main/java/de/jplag/java/JavaLanguage.java
@@ -14,6 +14,7 @@
  */
 @MetaInfServices(de.jplag.Language.class)
 public class JavaLanguage implements de.jplag.Language {
+    private static final String NAME = "Java";
     private static final String IDENTIFIER = "java";
 
     private final Parser parser;
@@ -29,7 +30,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "Javac based AST plugin";
+        return NAME;
     }
 
     @Override
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java
index 487effaa24..9b7678681e 100644
--- a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java
+++ b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java
@@ -10,7 +10,7 @@
 @MetaInfServices(de.jplag.Language.class)
 public class KotlinLanguage extends AbstractAntlrLanguage {
 
-    private static final String NAME = "Kotlin Parser";
+    private static final String NAME = "Kotlin";
     private static final String IDENTIFIER = "kotlin";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
     private static final String[] FILE_EXTENSIONS = {".kt"};
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
index 846a047e68..0d9ad7f150 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
@@ -11,7 +11,7 @@
 @MetaInfServices(Language.class)
 public class LLVMIRLanguage extends AbstractAntlrLanguage {
 
-    private static final String NAME = "LLVMIR Parser";
+    private static final String NAME = "LLVM IR";
     private static final String IDENTIFIER = "llvmir";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 70;
     private static final String[] FILE_EXTENSIONS = {".ll"};
diff --git a/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java b/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
index 3df6587284..2a70481276 100644
--- a/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
+++ b/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
@@ -6,7 +6,7 @@
 
 @MetaInfServices(de.jplag.Language.class)
 public class PythonLanguage extends AbstractAntlrLanguage {
-
+    private static final String NAME = "Python";
     private static final String IDENTIFIER = "python3";
 
     public PythonLanguage() {
@@ -20,7 +20,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "Python3 Parser";
+        return NAME;
     }
 
     @Override
diff --git a/languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java b/languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java
index d09e23b722..98b0171bf9 100644
--- a/languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java
+++ b/languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java
@@ -15,7 +15,7 @@
 @MetaInfServices(de.jplag.Language.class)
 public class RLanguage implements de.jplag.Language {
 
-    private static final String NAME = "R Parser";
+    private static final String NAME = "R";
     private static final String IDENTIFIER = "rlang";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
     private static final String[] FILE_EXTENSION = {".R", ".r"};
diff --git a/languages/rust/src/main/java/de/jplag/rust/RustLanguage.java b/languages/rust/src/main/java/de/jplag/rust/RustLanguage.java
index 50f0826e04..1a5cfa4f81 100644
--- a/languages/rust/src/main/java/de/jplag/rust/RustLanguage.java
+++ b/languages/rust/src/main/java/de/jplag/rust/RustLanguage.java
@@ -16,7 +16,7 @@
 public class RustLanguage implements de.jplag.Language {
 
     protected static final String[] FILE_EXTENSIONS = {".rs"};
-    private static final String NAME = "Rust Language Module";
+    private static final String NAME = "Rust";
     private static final String IDENTIFIER = "rust";
     private static final int MINIMUM_TOKEN_MATCH = 8;
 
diff --git a/languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.scala b/languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.scala
index 424b0f7334..bf226a5ced 100644
--- a/languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.scala
+++ b/languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.scala
@@ -14,7 +14,7 @@ class ScalaLanguage extends de.jplag.Language {
 
   override def suffixes: Array[String] = fileExtensions
 
-  override def getName = "Scala parser"
+  override def getName = "Scala"
 
   override def getIdentifier = "scala"
 
diff --git a/languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java b/languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java
index 0ebbf4ef97..13e0c89f72 100644
--- a/languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java
+++ b/languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java
@@ -12,6 +12,7 @@
 @MetaInfServices(de.jplag.Language.class)
 public class SchemeLanguage implements de.jplag.Language {
 
+    private static final String NAME = "Scheme";
     private static final String IDENTIFIER = "scheme";
     private final de.jplag.scheme.Parser parser;
 
@@ -26,7 +27,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "SchemeR4RS Parser [basic markup]";
+        return NAME;
     }
 
     @Override
diff --git a/languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java b/languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java
index ec6316f4dd..ba4af3e8eb 100644
--- a/languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java
+++ b/languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java
@@ -26,7 +26,7 @@ public class ScxmlLanguage implements de.jplag.Language {
      */
     public static final String VIEW_FILE_SUFFIX = ".scxmlview";
 
-    private static final String NAME = "SCXML (Statechart XML)";
+    private static final String NAME = "SCXML";
     private static final String IDENTIFIER = "scxml";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 6;
 
diff --git a/languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java b/languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java
index 87e13269fa..82a56d11e4 100644
--- a/languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java
+++ b/languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java
@@ -17,7 +17,7 @@ public class SwiftLanguage implements de.jplag.Language {
 
     private static final String IDENTIFIER = "swift";
 
-    private static final String NAME = "Swift Parser";
+    private static final String NAME = "Swift";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
     private static final String[] FILE_EXTENSIONS = {".swift"};
     private final SwiftParserAdapter parserAdapter;
diff --git a/languages/text/src/main/java/de/jplag/text/NaturalLanguage.java b/languages/text/src/main/java/de/jplag/text/NaturalLanguage.java
index 5727130097..057c06e56e 100644
--- a/languages/text/src/main/java/de/jplag/text/NaturalLanguage.java
+++ b/languages/text/src/main/java/de/jplag/text/NaturalLanguage.java
@@ -18,6 +18,7 @@
 public class NaturalLanguage implements de.jplag.Language {
 
     private static final String IDENTIFIER = "text";
+    private static final String NAME = "Text (naive)";
     private final ParserAdapter parserAdapter;
 
     public NaturalLanguage() {
@@ -31,7 +32,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "Text Parser (naive)";
+        return NAME;
     }
 
     @Override
diff --git a/languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java b/languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java
index 9fa5ad514c..8dda2b3486 100644
--- a/languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java
+++ b/languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java
@@ -11,6 +11,7 @@
 public class TypeScriptLanguage extends AbstractAntlrLanguage {
 
     private static final String IDENTIFIER = "typescript";
+    private static final String NAME = "TypeScript";
     private final TypeScriptLanguageOptions options = new TypeScriptLanguageOptions();
 
     @Override
@@ -20,7 +21,7 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return "Typescript Parser";
+        return NAME;
     }
 
     @Override