diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/BindableFunctionProxyFactory.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/BindableFunctionProxyFactory.java
index bb687efb7..fb3e5f550 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/BindableFunctionProxyFactory.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/BindableFunctionProxyFactory.java
@@ -112,7 +112,7 @@ class BindableFunctionProxyFactory extends BindableProxyFactory {
 	}
 
 	private String buildInputNameForIndex(int index) {
-		return new StringBuilder(this.functionDefinition.replace("|", ""))
+		return new StringBuilder(this.functionDefinition.replace(",", "|").replace("|", ""))
 			.append(FunctionConstants.DELIMITER)
 			.append(FunctionConstants.DEFAULT_INPUT_SUFFIX)
 			.append(FunctionConstants.DELIMITER)
@@ -121,7 +121,7 @@ class BindableFunctionProxyFactory extends BindableProxyFactory {
 	}
 
 	private String buildOutputNameForIndex(int index) {
-		return new StringBuilder(this.functionDefinition.replace("|", ""))
+		return new StringBuilder(this.functionDefinition.replace(",", "|").replace("|", ""))
 				.append(FunctionConstants.DELIMITER)
 				.append(FunctionConstants.DEFAULT_OUTPUT_SUFFIX)
 				.append(FunctionConstants.DELIMITER)