diff --git a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
index 80f5292c740..b1839095333 100644
--- a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
+++ b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
@@ -162,10 +162,10 @@ string parameterAccess(Parameter p) {
   if
     p.getType() instanceof Array and
     not isPrimitiveTypeUsedForBulkData(p.getType().(Array).getElementType())
-  then result = "ArrayElement of Argument[" + p.getPosition() + "]"
+  then result = "Argument[" + p.getPosition() + "].ArrayElement"
   else
     if p.getType() instanceof ContainerType
-    then result = "Element of Argument[" + p.getPosition() + "]"
+    then result = "Argument[" + p.getPosition() + "].Element"
     else result = "Argument[" + p.getPosition() + "]"
 }
 
diff --git a/java/ql/test/utils/model-generator/CaptureSourceModels.expected b/java/ql/test/utils/model-generator/CaptureSourceModels.expected
index badf498335b..7500f91f487 100644
--- a/java/ql/test/utils/model-generator/CaptureSourceModels.expected
+++ b/java/ql/test/utils/model-generator/CaptureSourceModels.expected
@@ -1,4 +1,4 @@
 | p;Sources;true;readUrl;(URL);;ReturnValue;remote |
 | p;Sources;true;socketStream;();;ReturnValue;remote |
-| p;Sources;true;sourceToParameter;(InputStream[],List);;ArrayElement of Argument[0];remote |
-| p;Sources;true;sourceToParameter;(InputStream[],List);;Element of Argument[1];remote |
+| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[0].ArrayElement;remote |
+| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[1].Element;remote |
diff --git a/java/ql/test/utils/model-generator/CaptureSummaryModels.expected b/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
index 2d2ee79ad26..27aaee50cb2 100644
--- a/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
+++ b/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
@@ -26,18 +26,18 @@
 | p;MultipleImpls$Strat2;true;getValue;();;Argument[-1];ReturnValue;taint |
 | p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[-1];taint |
 | p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint |
-| p;ParamFlow;true;addTo;(String,List);;Argument[0];Element of Argument[1];taint |
-| p;ParamFlow;true;returnArrayElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint |
-| p;ParamFlow;true;returnCollectionElement;(List);;Element of Argument[0];ReturnValue;taint |
-| p;ParamFlow;true;returnIterableElement;(Iterable);;Element of Argument[0];ReturnValue;taint |
-| p;ParamFlow;true;returnIteratorElement;(Iterator);;Element of Argument[0];ReturnValue;taint |
+| p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint |
+| p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint |
+| p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint |
+| p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint |
+| p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint |
 | p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint |
 | p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint |
-| p;ParamFlow;true;returnVarArgElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint |
+| p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint |
 | p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint |
 | p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint |
 | p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint |
-| p;Pojo;false;fillIn;(List);;Argument[-1];Element of Argument[0];taint |
+| p;Pojo;false;fillIn;(List);;Argument[-1];Argument[0].Element;taint |
 | p;Pojo;false;getBoxedBytes;();;Argument[-1];ReturnValue;taint |
 | p;Pojo;false;getBoxedChars;();;Argument[-1];ReturnValue;taint |
 | p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;taint |