diff --git a/CLIENT_DATA/AdobeAIR.xml b/CLIENT_DATA/AdobeAIR_package.xml
similarity index 100%
rename from CLIENT_DATA/AdobeAIR.xml
rename to CLIENT_DATA/AdobeAIR_package.xml
diff --git a/CLIENT_DATA/mms.cfg b/CLIENT_DATA/AdobeFlash_mms.cfg
similarity index 100%
rename from CLIENT_DATA/mms.cfg
rename to CLIENT_DATA/AdobeFlash_mms.cfg
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 6b67c71..d9b18e7 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -81,7 +81,7 @@ function create() {
 
     # Move Adobe Air and sereby config in place
     mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe
-    mv -v $INST_DIR/CLIENT_DATA/AdobeAIR.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
+    mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
     mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
     sed 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
     sed "s!.\..\..\....!${AIRVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
@@ -116,7 +116,7 @@ function create() {
 	sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
 	sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
     fi
-    mv -v $INST_DIR/CLIENT_DATA/mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg
+    mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg
     sed 's/.*\t<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
     sed 's/.*\t<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
     echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat