diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf
index ffea7326a076..91e43be5aa29 100644
--- a/tools/topology/topology2/cavs-nocodec.conf
+++ b/tools/topology/topology2/cavs-nocodec.conf
@@ -83,11 +83,11 @@ Define {
 	SSP1_ENABLED			"true"
 	PASSTHROUGH			"false"
 	SSP0_PCM_NAME			"Port0"
-	SSP0_CAPTURE_PCM		"ssp-capture"
+	SSP0_CAPTURE_PCM		"Port0 2nd Capture"
 	SSP1_PCM_NAME			"Port1"
 	SSP2_PCM_NAME			"Port2"
-	DMIC0_PCM_0_NAME		"DMIC0 Raw"
-	DMIC0_PCM_1_NAME		"DMIC0 Raw 2"
+	DMIC0_PCM_0_NAME		"DMIC SFX1"
+	DMIC0_PCM_1_NAME		"DMIC SFX2"
 }
 
 # override defaults with platform-specific config
@@ -284,7 +284,7 @@ IncludeByKey.PASSTHROUGH {
 				}
 				Object.Widget.gain.1 {
 					Object.Control.mixer.1 {
-						name 'Post Demux $SSP0_CAPTURE_PCM Capture Volume'
+						name 'Post Demux $SSP0_CAPTURE_PCM Volume'
 					}
 				}
 			}
diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
index 9d0ba0793100..6630d4045266 100644
--- a/tools/topology/topology2/platform/intel/dmic-generic.conf
+++ b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -1,5 +1,5 @@
 Define {
-       DMIC0_PCM_NAME	"DMIC"
+       DMIC0_PCM_NAME	"DMIC Raw"
 }
 
 Object.Dai.DMIC [