diff --git a/target/epiam/config.in b/target/epiam/config.in
index 8dbb4ebd5..3b931346e 100644
--- a/target/epiam/config.in
+++ b/target/epiam/config.in
@@ -154,7 +154,7 @@ pkgfilter sed '
 # Disable the rest
 /.*/		{ s/^X /O / ; p; d; };'
 
-ROCKCFG_X86_OPT='via-c3-improved'
+ROCKCFGSET_X86_OPT='via-c3-improved'
 ROCKCFGSET_CREATE_TARBZ2=0
 ROCKCFGSET_CREATE_GEM=1
 
@@ -164,4 +164,9 @@ ROCKCFGSET_DO_REBUILD_STAGE=0
 ROCKCFGSET_CREATE_DOCS=1
 ROCKCFGSET_DISABLE_NLS=0
 
-ROCKCFG_PKG_MPLAYER_RUN_CPUDETECT=0
+ROCKCFGSET_KERNEL_BOOTSPLASH='1'
+ROCKCFGSET_PKG_LINUX_CUSTCONFIG='1'
+# export CFLAGS="-s -O3 -march=i686 -fomit-frame-pointer -falign-functions=4 -funroll-loops -fexpensive-optimizations -malign-double -fschedule-insns2"
+
+ROCKCFGSET_PKG_MPLAYER_RUN_CPUDETECT=0
+
diff --git a/target/epiam/preconfig.in b/target/epiam/preconfig.in
index 6c8b92069..6a7ee5e4d 100644
--- a/target/epiam/preconfig.in
+++ b/target/epiam/preconfig.in
@@ -23,7 +23,3 @@
 # http://epia.std-err.de/   good source of info
 CFGTEMP_TARGETLIST="$CFGTEMP_TARGETLIST epiam ROCK_Linux_for_VIA_EPIA_M"
 
-ROCKCFG_KERNEL_BOOTSPLASH='1'
-ROCKCFG_PKG_LINUX_CUSTCONFIG='1'
-# export CFLAGS="-s -O3 -march=i686 -fomit-frame-pointer -falign-functions=4 -funroll-loops -fexpensive-optimizations -malign-double -fschedule-insns2"
-