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 195af313b..f021a9e11 100644
--- a/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
+++ b/languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
@@ -8,7 +8,7 @@
 import de.jplag.antlr.AbstractAntlrLanguage;
 import de.jplag.tokentypes.ArraySyntaxTokenTypes;
 import de.jplag.tokentypes.ExceptionHandlingTokenTypes;
-import de.jplag.tokentypes.ImperativeTokenAttribute;
+import de.jplag.tokentypes.ImperativeTokenType;
 import de.jplag.tokentypes.InlineIfTokenTypes;
 import de.jplag.tokentypes.ObjectOrientationTokens;
 
@@ -56,7 +56,7 @@ public boolean supportsNormalization() {
 
     @Override
     public List<Class<?>> getTokenContexts() {
-        return List.of(ArraySyntaxTokenTypes.class, ExceptionHandlingTokenTypes.class, ImperativeTokenAttribute.class, InlineIfTokenTypes.class,
+        return List.of(ArraySyntaxTokenTypes.class, ExceptionHandlingTokenTypes.class, ImperativeTokenType.class, InlineIfTokenTypes.class,
                 ObjectOrientationTokens.class);
     }
 }
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 2b4fa72de..a41d8355e 100644
--- a/languages/java/src/main/java/de/jplag/java/JavaLanguage.java
+++ b/languages/java/src/main/java/de/jplag/java/JavaLanguage.java
@@ -13,11 +13,9 @@
 import de.jplag.tokentypes.AssertTokenTypes;
 import de.jplag.tokentypes.CodeStructureTokenTypes;
 import de.jplag.tokentypes.ExceptionHandlingTokenTypes;
-import de.jplag.tokentypes.ImperativeTokenAttribute;
+import de.jplag.tokentypes.ImperativeTokenType;
 import de.jplag.tokentypes.InlineIfTokenTypes;
 import de.jplag.tokentypes.ObjectOrientationTokens;
-import de.jplag.tokentypes.ObjectOrientationWithInterfacesTokenAttributes;
-import de.jplag.tokentypes.SynchronizedTokenTypes;
 
 /**
  * Language for Java 9 and newer.
@@ -76,7 +74,6 @@ public String toString() {
     @Override
     public List<Class<?>> getTokenContexts() {
         return List.of(AnnotationTokenTypes.class, ArraySyntaxTokenTypes.class, AssertTokenTypes.class, CodeStructureTokenTypes.class,
-                ExceptionHandlingTokenTypes.class, ImperativeTokenAttribute.class, InlineIfTokenTypes.class, ObjectOrientationTokens.class,
-                SynchronizedTokenTypes.class, ObjectOrientationWithInterfacesTokenAttributes.class);
+                ExceptionHandlingTokenTypes.class, ImperativeTokenType.class, InlineIfTokenTypes.class, ObjectOrientationTokens.class);
     }
 }
diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index c0945e49f..621ad37bc 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -6145,12 +6145,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/sortablejs": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
-      "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==",
-      "peer": true
-    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -6782,7 +6776,7 @@
       "version": "5.6.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
-      "devOptional": true,
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"