diff --git a/tools/topology/topology2/include/common/tokens.conf b/tools/topology/topology2/include/common/tokens.conf
index 3277c7cb0497..534a43720b96 100644
--- a/tools/topology/topology2/include/common/tokens.conf
+++ b/tools/topology/topology2/include/common/tokens.conf
@@ -52,6 +52,7 @@ Object.Base.VendorToken {
 		curve_type		260
 		curve_duration		261
 		init_value		262
+		no_wname_in_kcontrol_name	263
 	}
 
 	"6" {
diff --git a/tools/topology/topology2/include/components/eqiir.conf b/tools/topology/topology2/include/components/eqiir.conf
index 8d4f5bb37fad..5016e3af65b0 100644
--- a/tools/topology/topology2/include/components/eqiir.conf
+++ b/tools/topology/topology2/include/components/eqiir.conf
@@ -61,4 +61,5 @@ Class.Widget."eqiir" {
 	no_pm			"true"
 	num_input_pins		1
 	num_output_pins		1
+	no_wname_in_kcontrol_name	"true"
 }
diff --git a/tools/topology/topology2/include/components/gain.conf b/tools/topology/topology2/include/components/gain.conf
index 395edb64ba94..373d5f04accb 100644
--- a/tools/topology/topology2/include/components/gain.conf
+++ b/tools/topology/topology2/include/components/gain.conf
@@ -68,6 +68,18 @@ Class.Widget."gain" {
                 token_ref       "gain.word"
 	}
 
+	DefineAttribute."no_wname_in_kcontrol_name" {
+		type	"string"
+		# Token set reference name
+		token_ref	"gain.bool"
+		constraints {
+			!valid_values [
+				"true"
+				"false"
+			]
+		}
+	}
+
 	# Attribute categories
 	attributes {
 		#
@@ -156,4 +168,5 @@ Class.Widget."gain" {
 	init_value		0x7fffffff
 	num_input_pins		1
 	num_output_pins		1
+	no_wname_in_kcontrol_name	"true"
 }