diff --git a/java/ql/src/semmle/code/java/frameworks/apache/Collections.qll b/java/ql/src/semmle/code/java/frameworks/apache/Collections.qll
index 92dfc534c56..bbda599b911 100644
--- a/java/ql/src/semmle/code/java/frameworks/apache/Collections.qll
+++ b/java/ql/src/semmle/code/java/frameworks/apache/Collections.qll
@@ -5,7 +5,7 @@ private import semmle.code.java.dataflow.FlowSteps
 private import semmle.code.java.dataflow.ExternalFlow
 
 /**
- * The method `isNotEmpty` in either `org.apache.commons.collections.CollectionUtils`
+ * The method `isEmpty` in either `org.apache.commons.collections.CollectionUtils`
  * or `org.apache.commons.collections4.CollectionUtils`.
  */
 class MethodApacheCollectionsIsEmpty extends Method {
@@ -146,7 +146,7 @@ private class ApacheKeyValueModel extends SummaryModelCsv {
         [
           ".keyvalue;AbstractKeyValue;true;AbstractKeyValue;;;Argument[0];MapKey of Argument[-1];value",
           ".keyvalue;AbstractKeyValue;true;AbstractKeyValue;;;Argument[1];MapValue of Argument[-1];value",
-          ".keyvalue;AbstractKeyValue;true;setKey;;;MapValue of Argument[-1];ReturnValue;value",
+          ".keyvalue;AbstractKeyValue;true;setKey;;;MapKey of Argument[-1];ReturnValue;value",
           ".keyvalue;AbstractKeyValue;true;setKey;;;Argument[0];MapKey of Argument[-1];value",
           ".keyvalue;AbstractKeyValue;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
           ".keyvalue;AbstractKeyValue;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
diff --git a/java/ql/test/library-tests/frameworks/apache-collections/Test.java b/java/ql/test/library-tests/frameworks/apache-collections/Test.java
index bed2384a73f..6884ff8b055 100644
--- a/java/ql/test/library-tests/frameworks/apache-collections/Test.java
+++ b/java/ql/test/library-tests/frameworks/apache-collections/Test.java
@@ -225,16 +225,16 @@ public class Test {
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
-			// "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapValue of Argument[-1];ReturnValue;value"
+			// "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapKey of Argument[-1];ReturnValue;value"
 			Object out = null;
-			DefaultKeyValue in = newDKVWithMapValue((String)source());
+			DefaultKeyValue in = newDKVWithMapKey((String)source());
 			out = in.setKey(null);
 			sink(out); // $ hasValueFlow
 		}
 		{
-			// "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapValue of Argument[-1];ReturnValue;value"
+			// "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapKey of Argument[-1];ReturnValue;value"
 			Object out = null;
-			MyAbstractKeyValue in = newMAKVWithMapValue((String)source());
+			MyAbstractKeyValue in = newMAKVWithMapKey((String)source());
 			out = in.mySetKey(null);
 			sink(out); // $ hasValueFlow
 		}