diff --git a/configure.ac b/configure.ac
index ff340a8a..53fca33e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,7 +658,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/ucm/PAZ00/Makefile \
 	  src/conf/ucm/GoogleNyan/Makefile \
 	  src/conf/ucm/broadwell-rt286/Makefile \
-	  src/conf/ucm/ROCKCHIP-I2S/Makefile \
+	  src/conf/ucm/VEYRON-I2S/Makefile \
 	  src/conf/topology/Makefile \
 	  src/conf/topology/broadwell/Makefile \
 	  modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index d1d51e59..3cce36af 100644
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -1 +1 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 ROCKCHIP-I2S
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S
diff --git a/src/conf/ucm/ROCKCHIP-I2S/Makefile.am b/src/conf/ucm/ROCKCHIP-I2S/Makefile.am
deleted file mode 100644
index 485a7402..00000000
--- a/src/conf/ucm/ROCKCHIP-I2S/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-alsaconfigdir = @ALSA_CONFIG_DIR@
-ucmdir = $(alsaconfigdir)/ucm/ROCKCHIP-I2S
-ucm_DATA = ROCKCHIP-I2S.conf HiFi.conf
-EXTRA_DIST = $(ucm_DATA)
diff --git a/src/conf/ucm/ROCKCHIP-I2S/HiFi.conf b/src/conf/ucm/VEYRON-I2S/HiFi.conf
similarity index 91%
rename from src/conf/ucm/ROCKCHIP-I2S/HiFi.conf
rename to src/conf/ucm/VEYRON-I2S/HiFi.conf
index 7bfe9959..292b8fca 100644
--- a/src/conf/ucm/ROCKCHIP-I2S/HiFi.conf
+++ b/src/conf/ucm/VEYRON-I2S/HiFi.conf
@@ -5,7 +5,7 @@ SectionVerb {
 	}
 
 	EnableSequence [
-		cdev "hw:ROCKCHIPI2S"
+		cdev "hw:VEYRONI2S"
 
 		cset "name='Left Speaker Mixer Left DAC Switch' on"
 		cset "name='Right Speaker Mixer Right DAC Switch' on"
@@ -49,19 +49,19 @@ SectionVerb {
 
 SectionDevice."Headphone".0 {
 	Value {
-		JackName "ROCKCHIP-I2S Headset Jack"
+		JackName "VEYRON-I2S Headset Jack"
 		OutputDspName ""
 	}
 
 	EnableSequence [
-		cdev "hw:ROCKCHIPI2S"
+		cdev "hw:VEYRONI2S"
 
 		cset "name='Speaker Switch' off"
 		cset "name='Headphone Left Switch' on"
 		cset "name='Headphone Right Switch' on"
 	]
 	DisableSequence [
-		cdev "hw:ROCKCHIPI2S"
+		cdev "hw:VEYRONI2S"
 
 		cset "name='Headphone Left Switch' off"
 		cset "name='Headphone Right Switch' off"
@@ -71,11 +71,11 @@ SectionDevice."Headphone".0 {
 
 SectionDevice."Mic".0 {
 	Value {
-		JackName "ROCKCHIP-I2S Headset Jack"
+		JackName "VEYRON-I2S Headset Jack"
 	}
 
 	EnableSequence [
-		cdev "hw:ROCKCHIPI2S"
+		cdev "hw:VEYRONI2S"
 
 		cset "name='Int Mic Switch' off"
 		cset "name='DMIC Mux' ADC"
@@ -84,7 +84,7 @@ SectionDevice."Mic".0 {
 	]
 
 	DisableSequence [
-		cdev "hw:ROCKCHIPI2S"
+		cdev "hw:VEYRONI2S"
 
 		cset "name='Headset Mic Switch' off"
 		cset "name='DMIC Mux' DMIC"
diff --git a/src/conf/ucm/VEYRON-I2S/Makefile.am b/src/conf/ucm/VEYRON-I2S/Makefile.am
new file mode 100644
index 00000000..2bb628e2
--- /dev/null
+++ b/src/conf/ucm/VEYRON-I2S/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/VEYRON-I2S
+ucm_DATA = VEYRON-I2S.conf HiFi.conf
+EXTRA_DIST = $(ucm_DATA)
diff --git a/src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf b/src/conf/ucm/VEYRON-I2S/VEYRON-I2S.conf
similarity index 67%
rename from src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf
rename to src/conf/ucm/VEYRON-I2S/VEYRON-I2S.conf
index 0c399b0d..2a92b6f5 100644
--- a/src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf
+++ b/src/conf/ucm/VEYRON-I2S/VEYRON-I2S.conf
@@ -1,4 +1,4 @@
-Comment "Rockchip card"
+Comment "Rockchip Veyron card"
 
 SectionUseCase."HiFi" {
 	File "HiFi.conf"