diff --git a/audioreach/module_rdsh.m4 b/audioreach/module_rdsh.m4
index 1d70dc4..4b33cef 100644
--- a/audioreach/module_rdsh.m4
+++ b/audioreach/module_rdsh.m4
@@ -1,5 +1,5 @@
 include(`util/util.m4') dnl
-dnl AR_MODULE_RDSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port)
+dnl AR_MODULE_RDSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, pcm-idx)
 define(`AR_MODULE_RDSH',
 `'
 `SectionVendorTuples."NAME_PREFIX.rdsh_ep$1_tuples" {'
@@ -24,7 +24,7 @@ define(`AR_MODULE_RDSH',
 `        index STR($1)'
 `        type "aif_out"'
 `        no_pm "true"'
-`        stream_name "MultiMedia$1 Capture"'
+`        stream_name "MultiMedia$11 Capture"'
 `        event_type "1"'
 `        event_flags "15"'
 `        subseq "10"'
diff --git a/audioreach/module_wrsh.m4 b/audioreach/module_wrsh.m4
index 7ad3204..5241e19 100644
--- a/audioreach/module_wrsh.m4
+++ b/audioreach/module_wrsh.m4
@@ -1,5 +1,5 @@
 include(`util/util.m4') dnl
-dnl AR_MODULE_WRSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port)
+dnl AR_MODULE_WRSH(index, sgidx, container-idx, iid, maxip-ports, max-op-ports, in-ports, outports, src-port, dst-port, pcm-index)
 define(`AR_MODULE_WRSH',
 `'
 `SectionVendorTuples."NAME_PREFIX.wrsh_ep$1_tuples" {'
@@ -24,7 +24,7 @@ define(`AR_MODULE_WRSH',
 `        index STR($1)'
 `        type "aif_in"'
 `        no_pm "true"'
-`        stream_name "MultiMedia$1 Playback"'
+`        stream_name "MultiMedia$11 Playback"'
 `        event_type "1"'
 `        event_flags "15"'
 `        subseq "10"'
diff --git a/audioreach/subgraph-stream-capture.m4 b/audioreach/subgraph-stream-capture.m4
index fe88a9e..6b05b25 100644
--- a/audioreach/subgraph-stream-capture.m4
+++ b/audioreach/subgraph-stream-capture.m4
@@ -63,6 +63,6 @@ dnl AR_MODULE_LOG(index, sgidx, container-idx, iid,               maxip-ports, m
 AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0)
 AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
 AR_MODULE_PCMENC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMENC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
-AR_MODULE_RDSH(MOD_INDEX,   SG_INDEX, CONTAINER_INDEX, RDSH_MODULE_IID,   1, 0, 2, 0, 1, 0)
+AR_MODULE_RDSH(MOD_INDEX,   SG_INDEX, CONTAINER_INDEX, RDSH_MODULE_IID,   1, 0, 2, 0, 1, 0, PCM_DAI_ID)
 
 STREAM_CAPTURE_ROUTE(MOD_INDEX, PCM_DAI_ID) 
diff --git a/audioreach/subgraph-stream-playback.m4 b/audioreach/subgraph-stream-playback.m4
index 03e5b7d..9a598ad 100644
--- a/audioreach/subgraph-stream-playback.m4
+++ b/audioreach/subgraph-stream-playback.m4
@@ -59,7 +59,7 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO
 
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  APM_CONTAINER_CAP_ID_CD, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
-AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2)
+AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2, PCM_DAI_ID)
 AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
 AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED)
 AR_MODULE_LOG(MOD_INDEX,    SG_INDEX, CONTAINER_INDEX, 	LOG_MODULE_IID,    1, 1, 2, 1, 1, 2, 0x000019af, 1, 0)
diff --git a/audioreach/subgraph-stream-vol-playback.m4 b/audioreach/subgraph-stream-vol-playback.m4
index 5f1d9cc..7f70179 100644
--- a/audioreach/subgraph-stream-vol-playback.m4
+++ b/audioreach/subgraph-stream-vol-playback.m4
@@ -62,7 +62,7 @@ AR_SUBGRAPH(SG_INDEX, PCM_DAI_ID, SG_IID_START, PCM_PERF_MODE, PCM_DIRECTION, CO
 
 AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START,  APM_CONTAINER_CAP_ID_CD, 8192, APM_CONT_GRAPH_POS_STREAM, APM_PROC_DOMAIN_ID_ADSP)
 
-AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2)
+AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	WRSH_MODULE_IID,  0, 1, 0, 0, 0, 2, PCM_DAI_ID)
 AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
 AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX,	PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED)
 AR_MODULE_VOL_CTRL(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2)