diff --git a/java/ql/src/printAst.ql b/java/ql/src/printAst.ql
index 8be94cb1d87..e2a0433deb5 100644
--- a/java/ql/src/printAst.ql
+++ b/java/ql/src/printAst.ql
@@ -2,7 +2,7 @@
  * @name Print AST
  * @description Outputs a representation of a file's Abstract Syntax Tree. This
  *              query is used by the VS Code extension.
- * @id csharp/print-ast
+ * @id java/print-ast
  * @kind graph
  * @tags ide-contextual-queries/print-ast
  */
diff --git a/java/ql/src/semmle/code/java/Import.qll b/java/ql/src/semmle/code/java/Import.qll
index 8f00e52245f..fbcfea4f905 100755
--- a/java/ql/src/semmle/code/java/Import.qll
+++ b/java/ql/src/semmle/code/java/Import.qll
@@ -51,7 +51,7 @@ class ImportOnDemandFromType extends Import {
 
   override string toString() { result = "import " + this.getTypeHoldingImport().toString() + ".*" }
 
-  override string getAPrimaryQlClass() { result = "ImportOnDemandFromTypw" }
+  override string getAPrimaryQlClass() { result = "ImportOnDemandFromType" }
 }
 
 /**
diff --git a/java/ql/src/semmle/code/java/Javadoc.qll b/java/ql/src/semmle/code/java/Javadoc.qll
index de06e629dba..61d978fbd35 100755
--- a/java/ql/src/semmle/code/java/Javadoc.qll
+++ b/java/ql/src/semmle/code/java/Javadoc.qll
@@ -92,7 +92,7 @@ class JavadocTag extends JavadocElement, JavadocParent, @javadocTag {
   /** Gets the text associated with this Javadoc tag. */
   override string getText() { result = this.getChild(0).toString() }
 
-  override string getAPrimaryQlClass() { result = "Javadoc" }
+  override string getAPrimaryQlClass() { result = "JavadocTag" }
 }
 
 /** A Javadoc `@param` tag. */
diff --git a/java/ql/src/semmle/code/java/PrintAst.ql b/java/ql/src/semmle/code/java/PrintAst.ql
index 7a34671e0fd..7814ec76039 100644
--- a/java/ql/src/semmle/code/java/PrintAst.ql
+++ b/java/ql/src/semmle/code/java/PrintAst.ql
@@ -1,7 +1,7 @@
 /**
  * @name Print AST
  * @description Outputs a representation of the Abstract Syntax Tree.
- * @id csharp/print-ast
+ * @id java/print-ast
  * @kind graph
  */
 
diff --git a/java/ql/test/library-tests/javadoc/PrintAst.expected b/java/ql/test/library-tests/javadoc/PrintAst.expected
index 901ebd4d4bd..5543dceaf01 100644
--- a/java/ql/test/library-tests/javadoc/PrintAst.expected
+++ b/java/ql/test/library-tests/javadoc/PrintAst.expected
@@ -24,6 +24,6 @@ javadoc/Test.java:
 #   18|     6: [Method] h
 #-----|       0: (Javadoc)
 #   17|         1: [Javadoc] /** @deprecated */
-#   17|           0: [Javadoc] @deprecated
+#   17|           0: [JavadocTag] @deprecated
 #   18|       3: [TypeAccess] void
 #   18|       5: [BlockStmt] stmt
diff --git a/java/ql/test/library-tests/printAst/PrintAst.expected b/java/ql/test/library-tests/printAst/PrintAst.expected
index 9f0280c529a..b23ed34ea82 100644
--- a/java/ql/test/library-tests/printAst/PrintAst.expected
+++ b/java/ql/test/library-tests/printAst/PrintAst.expected
@@ -6,7 +6,7 @@ A.java:
 #    1|         0: [JavadocText] Another javadoc
 #    3|       2: [Javadoc] /** A class ... */
 #    4|         0: [JavadocText] A class
-#    6|         1: [Javadoc] @author
+#    6|         1: [JavadocTag] @author
 #    6|           0: [JavadocText] someone
 #    9|     3: [Interface] Ann1
 #   10|       1: [Method] value