diff --git a/tools/topology/topology2/cavs-uaol.conf b/tools/topology/topology2/cavs-uaol.conf
index a351ca1e9f7a..85ee38b5401e 100644
--- a/tools/topology/topology2/cavs-uaol.conf
+++ b/tools/topology/topology2/cavs-uaol.conf
@@ -42,8 +42,8 @@
 <host.conf>
 
 Define {
-	UAOL_PLAYBACK_PCM	'UAOL0 Playback'
-	UAOL_CAPTURE_PCM	'UAOL0 Capture'
+	UAOL_PLAYBACK_PCM	'USB Offload 0 Playback'
+	UAOL_CAPTURE_PCM	'USB Offload 0 Capture'
 	# The two directions are separate DAI links so that the format fixup of
 	# a link is decided by the DAI copier of that direction alone, and the
 	# link carries two streams per direction, each with a backend of its
@@ -59,7 +59,7 @@ Define {
 	UAOL_CP_BE_ID		10
 	# UAOL_DAI_INDEX is the UAOL link the DSP uses, only link 0 is addressable
 	UAOL_DAI_INDEX		0
-	UAOL_PCM_NAME		'UAOL0'
+	UAOL_PCM_NAME		'USB Offload 0'
 	UAOL_PCM_ID		21
 	UAOL_PB_HOST_PIPELINE_ID	210
 	UAOL_PB_DAI_PIPELINE_ID		211
@@ -68,13 +68,13 @@ Define {
 
 	# Second stream pair of the link, on its own PCM
 	UAOL_NUM_STREAMS	2
-	UAOL_PLAYBACK1_PCM	'UAOL1 Playback'
-	UAOL_CAPTURE1_PCM	'UAOL1 Capture'
+	UAOL_PLAYBACK1_PCM	'USB Offload 1 Playback'
+	UAOL_CAPTURE1_PCM	'USB Offload 1 Capture'
 	UAOL_PB1_DAI_NAME	'UAOL0-Play1'
 	UAOL_CP1_DAI_NAME	'UAOL0-Cap1'
 	UAOL_PB1_BE_ID		11
 	UAOL_CP1_BE_ID		12
-	UAOL_PCM1_NAME		'UAOL1'
+	UAOL_PCM1_NAME		'USB Offload 1'
 	UAOL_PCM1_ID		22
 	UAOL_PB1_HOST_PIPELINE_ID	215
 	UAOL_PB1_DAI_PIPELINE_ID	216
@@ -94,10 +94,10 @@ Define {
 	# The deep buffer PCMs feed the same mixer as the normal playback PCM of
 	# their stream
 	UAOL_DEEP_BUFFER	'true'
-	UAOL_DB_PCM_NAME	'Deepbuffer UAOL0'
+	UAOL_DB_PCM_NAME	'Deepbuffer USB Offload 0'
 	UAOL_DB_PCM_ID		23
 	UAOL_DB_PIPELINE_ID	214
-	UAOL_DB1_PCM_NAME	'Deepbuffer UAOL1'
+	UAOL_DB1_PCM_NAME	'Deepbuffer USB Offload 1'
 	UAOL_DB1_PCM_ID		24
 	UAOL_DB1_PIPELINE_ID	219
 }
diff --git a/tools/topology/topology2/development/sof-hda-generic-uaol.conf b/tools/topology/topology2/development/sof-hda-generic-uaol.conf
index bb3ffcd1501b..d997a90210a9 100644
--- a/tools/topology/topology2/development/sof-hda-generic-uaol.conf
+++ b/tools/topology/topology2/development/sof-hda-generic-uaol.conf
@@ -34,8 +34,8 @@
 <output_audio_format.conf>
 
 Define {
-	UAOL_PLAYBACK_PCM	'UAOL0 Playback'
-	UAOL_CAPTURE_PCM	'UAOL0 Capture'
+	UAOL_PLAYBACK_PCM	'USB Offload 0 Playback'
+	UAOL_CAPTURE_PCM	'USB Offload 0 Capture'
 	# The two directions are separate DAI links so that the format fixup of
 	# a link is decided by the DAI copier of that direction alone, and the
 	# link carries two streams per direction, each with a backend of its
@@ -52,7 +52,7 @@ Define {
 	UAOL_CP_BE_ID		10
 	# UAOL_DAI_INDEX is the UAOL link the DSP uses, only link 0 is addressable
 	UAOL_DAI_INDEX		0
-	UAOL_PCM_NAME		'UAOL0'
+	UAOL_PCM_NAME		'USB Offload 0'
 	UAOL_PCM_ID		21
 	UAOL_PB_HOST_PIPELINE_ID	210
 	UAOL_PB_DAI_PIPELINE_ID		211
@@ -64,13 +64,13 @@ Define {
 	# routes point at it and the second PCM fails with EBUSY while the first
 	# one runs, a second device or a second PCM of the first lets both run
 	UAOL_NUM_STREAMS	2
-	UAOL_PLAYBACK1_PCM	'UAOL1 Playback'
-	UAOL_CAPTURE1_PCM	'UAOL1 Capture'
+	UAOL_PLAYBACK1_PCM	'USB Offload 1 Playback'
+	UAOL_CAPTURE1_PCM	'USB Offload 1 Capture'
 	UAOL_PB1_DAI_NAME	'UAOL0-Play1'
 	UAOL_CP1_DAI_NAME	'UAOL0-Cap1'
 	UAOL_PB1_BE_ID		11
 	UAOL_CP1_BE_ID		12
-	UAOL_PCM1_NAME		'UAOL1'
+	UAOL_PCM1_NAME		'USB Offload 1'
 	UAOL_PCM1_ID		22
 	UAOL_PB1_HOST_PIPELINE_ID	215
 	UAOL_PB1_DAI_PIPELINE_ID	216
@@ -90,10 +90,10 @@ Define {
 	# The deep buffer PCMs feed the same mixer as the normal playback PCM of
 	# their stream, next to the one the HDA playback has
 	UAOL_DEEP_BUFFER	'true'
-	UAOL_DB_PCM_NAME	'Deepbuffer UAOL0'
+	UAOL_DB_PCM_NAME	'Deepbuffer USB Offload 0'
 	UAOL_DB_PCM_ID		23
 	UAOL_DB_PIPELINE_ID	214
-	UAOL_DB1_PCM_NAME	'Deepbuffer UAOL1'
+	UAOL_DB1_PCM_NAME	'Deepbuffer USB Offload 1'
 	UAOL_DB1_PCM_ID		24
 	UAOL_DB1_PIPELINE_ID	219
 }