diff --git a/README.md b/README.md
index 0cfb7219f7..af3f526542 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,7 @@ In the following, a list of all supported languages with their supported languag
 | [Scala](https://www.scala-lang.org)                              |  2.13.8 | scala                 | beta | Scalameta |
 | [Scheme](http://www.scheme-reports.org)                          |       ? | scheme                | unknown | JavaCC |
 | [Swift](https://www.swift.org)                                   |     5.4 | swift                 | beta | ANTLR 4 |
-| [EMF Metamodel](https://www.eclipse.org/modeling/emf/)           |  2.25.0 | emf-metamodel         | alpha | EMF |
-| [EMF Metamodel](https://www.eclipse.org/modeling/emf/) (dynamic) |  2.25.0 | emf-metamodel-dynamic | alpha | EMF |
+| [EMF Metamodel](https://www.eclipse.org/modeling/emf/)           |  2.25.0 | emf                   | alpha | EMF |
 | Text (naive)                                                     |       - | text                  | legacy | CoreNLP |
 
 ## Download and Installation
@@ -67,7 +66,7 @@ named arguments:
   -h, --help             show this help message and exit
   -new NEW [NEW ...]     Root-directory with submissions to check for plagiarism (same as the root directory)
   -old OLD [OLD ...]     Root-directory with prior submissions to compare against
-  -l {cpp,csharp,emf-metamodel,emf-metamodel-dynamic,go,java,kotlin,python3,rlang,scala,scheme,swift,text}
+  -l {cpp,csharp,emf,go,java,kotlin,python3,rlang,scala,scheme,swift,text}
                          Select the language to parse the submissions (default: java)
   -bc BC                 Path of  the  directory  containing  the  base  code  (common  framework  used  in  all
                          submissions)
diff --git a/cli/pom.xml b/cli/pom.xml
index c6cf101928..c455f5b6b2 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -85,11 +85,6 @@
             <artifactId>emf-metamodel</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>de.jplag</groupId>
-            <artifactId>emf-metamodel-dynamic</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <!-- CLI -->
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
diff --git a/cli/src/test/java/de/jplag/cli/LanguageTest.java b/cli/src/test/java/de/jplag/cli/LanguageTest.java
index 8a66e6a565..3e701c3fd6 100644
--- a/cli/src/test/java/de/jplag/cli/LanguageTest.java
+++ b/cli/src/test/java/de/jplag/cli/LanguageTest.java
@@ -31,7 +31,7 @@ void testInvalidLanguage() throws Exception {
     @Test
     void testLoading() {
         var languages = LanguageLoader.getAllAvailableLanguages();
-        Assertions.assertEquals(13, languages.size(), "Loaded Languages: " + languages.keySet());
+        Assertions.assertEquals(12, languages.size(), "Loaded Languages: " + languages.keySet());
     }
 
     @Test
diff --git a/languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java b/languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java
index 5fc65b043e..9000073bca 100644
--- a/languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java
+++ b/languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java
@@ -12,7 +12,7 @@
 @MetaInfServices(de.jplag.Language.class)
 public class Language extends de.jplag.emf.Language {
     private static final String NAME = "EMF metamodels (dynamically created token set)";
-    public static final String IDENTIFIER = "emf-metamodel-dynamic";
+    public static final String IDENTIFIER = "emf-dynamic";
 
     private static final int DEFAULT_MIN_TOKEN_MATCH = 10;
 
diff --git a/languages/emf-metamodel/src/main/java/de/jplag/emf/Language.java b/languages/emf-metamodel/src/main/java/de/jplag/emf/Language.java
index a721701a2c..f7783fde02 100644
--- a/languages/emf-metamodel/src/main/java/de/jplag/emf/Language.java
+++ b/languages/emf-metamodel/src/main/java/de/jplag/emf/Language.java
@@ -21,7 +21,7 @@ public class Language implements de.jplag.Language {
     public static final String FILE_ENDING = "." + EcorePackage.eNAME;
 
     private static final String NAME = "EMF metamodel";
-    public static final String IDENTIFIER = "emf-metamodel";
+    public static final String IDENTIFIER = "emf";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 6;
 
     protected final EcoreParser parser;
diff --git a/languages/emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java b/languages/emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java
index b961ddf4ab..842186647b 100644
--- a/languages/emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java
+++ b/languages/emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java
@@ -85,7 +85,7 @@ public MetamodelToken convertToMetadataEnrichedTokenAndAdd(MetamodelToken token,
      * @param suffix is the suffix of the file to be written.
      */
     public void writeToFile(String suffix) {
-        File treeViewFile = new File(file, suffix);
+        File treeViewFile = new File(file + suffix);
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(treeViewFile));) {
             if (!treeViewFile.createNewFile()) {
                 logger.warn("Overwriting tree view file: {}", treeViewFile);