diff --git a/test/groovy/TransportRequestCreateTest.groovy b/test/groovy/TransportRequestCreateTest.groovy
index 93eebb81d..703a54fc5 100644
--- a/test/groovy/TransportRequestCreateTest.groovy
+++ b/test/groovy/TransportRequestCreateTest.groovy
@@ -72,7 +72,7 @@ public class TransportRequestCreateTest extends BasePiperTest {
     public void changeIdNotProvidedSOLANTest() {
 
         thrown.expect(IllegalArgumentException)
-        thrown.expectMessage("Change document id not provided (parameter: 'changeDocumentId' or via commit history).")
+        thrown.expectMessage("Change document id not provided (parameter: 'changeDocumentId' provided to the step call or via commit history).")
         ChangeManagement cm = new ChangeManagement(nullScript) {
             String getChangeDocumentId(
                                        String from,
diff --git a/test/groovy/TransportRequestReleaseTest.groovy b/test/groovy/TransportRequestReleaseTest.groovy
index ff1281c03..c4849a22a 100644
--- a/test/groovy/TransportRequestReleaseTest.groovy
+++ b/test/groovy/TransportRequestReleaseTest.groovy
@@ -73,7 +73,7 @@ public class TransportRequestReleaseTest extends BasePiperTest {
         }
 
         thrown.expect(IllegalArgumentException)
-        thrown.expectMessage("Change document id not provided (parameter: 'changeDocumentId' or via commit history).")
+        thrown.expectMessage("Change document id not provided (parameter: 'changeDocumentId' provided to the step call or via commit history).")
 
         stepRule.step.transportRequestRelease(script: nullScript, transportRequestId: '001', cmUtils: cm)
     }
@@ -91,7 +91,7 @@ public class TransportRequestReleaseTest extends BasePiperTest {
         }
 
         thrown.expect(IllegalArgumentException)
-        thrown.expectMessage("Transport request id not provided (parameter: 'transportRequestId' or via commit history).")
+        thrown.expectMessage("Transport request id not provided (parameter: 'transportRequestId' provided to the step call or via commit history).")
 
         stepRule.step.transportRequestRelease(script: nullScript, changeDocumentId: '001', cmUtils: cm)
     }
diff --git a/test/groovy/TransportRequestUploadFileTest.groovy b/test/groovy/TransportRequestUploadFileTest.groovy
index a6142c7ab..6db2801da 100644
--- a/test/groovy/TransportRequestUploadFileTest.groovy
+++ b/test/groovy/TransportRequestUploadFileTest.groovy
@@ -75,7 +75,7 @@ public class TransportRequestUploadFileTest extends BasePiperTest {
         // straight forward test case for CTS
 
         thrown.expect(IllegalArgumentException)
-        thrown.expectMessage("Change document id not provided (parameter: 'changeDocumentId' or via commit history).")
+        thrown.expectMessage("Change document id not provided (parameter: 'changeDocumentId' provided to the step call or via commit history).")
 
         ChangeManagement cm = new ChangeManagement(nullScript) {
             String getChangeDocumentId(
@@ -106,7 +106,7 @@ public class TransportRequestUploadFileTest extends BasePiperTest {
         }
 
         thrown.expect(IllegalArgumentException)
-        thrown.expectMessage("Transport request id not provided (parameter: 'transportRequestId' or via commit history).")
+        thrown.expectMessage("Transport request id not provided (parameter: 'transportRequestId' provided to the step call or via commit history).")
 
         stepRule.step.transportRequestUploadFile(script: nullScript, changeDocumentId: '001', applicationId: 'app', filePath: '/path', cmUtils: cm)
     }
diff --git a/vars/transportRequestCreate.groovy b/vars/transportRequestCreate.groovy
index 4780a1089..b35f919b3 100644
--- a/vars/transportRequestCreate.groovy
+++ b/vars/transportRequestCreate.groovy
@@ -169,7 +169,7 @@ void call(Map parameters = [:]) {
             configHelper.mixin([changeDocumentId: changeDocumentId?.trim() ?: null], ['changeDocumentId'] as Set)
                         .withMandatoryProperty('developmentSystemId')
                         .withMandatoryProperty('changeDocumentId',
-                            "Change document id not provided (parameter: \'changeDocumentId\' or via commit history).")
+                            "Change document id not provided (parameter: \'changeDocumentId\' provided to the step call or via commit history).")
         }
 
         configuration = configHelper.use()
diff --git a/vars/transportRequestRelease.groovy b/vars/transportRequestRelease.groovy
index 951745ff8..98d17c126 100644
--- a/vars/transportRequestRelease.groovy
+++ b/vars/transportRequestRelease.groovy
@@ -124,14 +124,14 @@ void call(Map parameters = [:]) {
 
             configHelper.mixin([changeDocumentId: changeDocumentId?.trim() ?: null], ['changeDocumentId'] as Set)
                         .withMandatoryProperty('changeDocumentId',
-                            "Change document id not provided (parameter: \'changeDocumentId\' or via commit history).")
+                            "Change document id not provided (parameter: \'changeDocumentId\' provided to the step call or via commit history).")
 
         }
 
         configuration = configHelper
                             .mixin([transportRequestId: transportRequestId?.trim() ?: null], ['transportRequestId'] as Set)
                             .withMandatoryProperty('transportRequestId',
-                                "Transport request id not provided (parameter: \'transportRequestId\' or via commit history).")
+                                "Transport request id not provided (parameter: \'transportRequestId\' provided to the step call or via commit history).")
                             .use()
 
         def closingMessage = ["[INFO] Closing transport request '${configuration.transportRequestId}'"]
diff --git a/vars/transportRequestUploadFile.groovy b/vars/transportRequestUploadFile.groovy
index 746c7075a..207f210c4 100644
--- a/vars/transportRequestUploadFile.groovy
+++ b/vars/transportRequestUploadFile.groovy
@@ -98,7 +98,9 @@ import static com.sap.piper.cm.StepHelpers.getBackendTypeAndLogInfoIfCMIntegrati
 @Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS.plus([
     /** @see transportRequestCreate */
     'changeDocumentId',
-    /** The id of the transport request to upload the file.*/
+    /** The id of the transport request to upload the file. This parameter is only taken into account
+      * when provided via signature to the step.
+      */
     'transportRequestId'])
 
 /** Uploads a file to a Transport Request. */
@@ -175,11 +177,11 @@ void call(Map parameters = [:]) {
         if(backendType == BackendType.SOLMAN) {
             configHelper
                 .withMandatoryProperty('changeDocumentId',
-                    "Change document id not provided (parameter: \'changeDocumentId\' or via commit history).")
+                    "Change document id not provided (parameter: \'changeDocumentId\' provided to the step call or via commit history).")
         }
         configuration = configHelper
             .withMandatoryProperty('transportRequestId',
-                "Transport request id not provided (parameter: \'transportRequestId\' or via commit history).")
+                "Transport request id not provided (parameter: \'transportRequestId\' provided to the step call or via commit history).")
             .use()
 
         def uploadingMessage = ['[INFO] Uploading file ' +