diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/ImplOfExternalSPI.java b/java/ql/test/utils/modelgenerator/dataflow/p/ImplOfExternalSPI.java
index a2e2992c8a6f..8aff43d05186 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/ImplOfExternalSPI.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/ImplOfExternalSPI.java
@@ -6,7 +6,7 @@
 
 public class ImplOfExternalSPI extends AbstractImplOfExternalSPI {
 
-  // sink=p;AbstractImplOfExternalSPI;true;accept;(File);;Argument[0];path-injection;df-generated
+  // sink=p;ImplOfExternalSPI;true;accept;(File);;Argument[0];path-injection;df-generated
   // neutral=p;ImplOfExternalSPI;accept;(File);summary;df-generated
   @Override
   public boolean accept(File pathname) {
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java b/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
index 7ef4df33b66f..eeebabeb68c6 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/PrivateFlowViaPublicInterface.java
@@ -29,7 +29,6 @@ public PrivateImplWithSink(File file) {
     }
 
     // summary=p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];ReturnValue;taint;df-generated
-    // sink=p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];path-injection;df-generated
     @Override
     public OutputStream openStream() throws IOException {
       return new FileOutputStream(file);
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Sinks.java b/java/ql/test/utils/modelgenerator/dataflow/p/Sinks.java
index bf1304b29924..972a8a245e37 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Sinks.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Sinks.java
@@ -88,7 +88,7 @@ public abstract class DataWriter {
   }
 
   public class DataWriterKind1 extends DataWriter {
-    // sink=p;Sinks$DataWriter;true;write;(String);;Argument[0];test-sink;df-generated
+    // sink=p;Sinks$DataWriterKind1;true;write;(String);;Argument[0];test-sink;df-generated
     // neutral=p;Sinks$DataWriterKind1;write;(String);summary;df-generated
     @Override
     public void write(String s) {
@@ -97,7 +97,7 @@ public void write(String s) {
   }
 
   public class DataWriterKind2 extends DataWriter {
-    // sink=p;Sinks$DataWriter;true;write;(String);;Argument[0];test-sink2;df-generated
+    // sink=p;Sinks$DataWriterKind2;true;write;(String);;Argument[0];test-sink2;df-generated
     // neutral=p;Sinks$DataWriterKind2;write;(String);summary;df-generated
     @Override
     public void write(String s) {
diff --git a/java/ql/test/utils/modelgenerator/dataflow/p/Sources.java b/java/ql/test/utils/modelgenerator/dataflow/p/Sources.java
index 91607b2522af..0da3f5225c6f 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/p/Sources.java
+++ b/java/ql/test/utils/modelgenerator/dataflow/p/Sources.java
@@ -92,7 +92,7 @@ public abstract class DataReader {
   }
 
   public class DataReaderKind1 extends DataReader {
-    // source=p;Sources$DataReader;true;read;();;ReturnValue;test-source;df-generated
+    // source=p;Sources$DataReaderKind1;true;read;();;ReturnValue;test-source;df-generated
     // neutral=p;Sources$DataReaderKind1;read;();summary;df-generated
     @Override
     public String read() {
@@ -101,7 +101,7 @@ public String read() {
   }
 
   public class DataReaderKind2 extends DataReader {
-    // source=p;Sources$DataReader;true;read;();;ReturnValue;test-source2;df-generated
+    // source=p;Sources$DataReaderKind2;true;read;();;ReturnValue;test-source2;df-generated
     // neutral=p;Sources$DataReaderKind2;read;();summary;df-generated
     @Override
     public String read() {