diff --git a/archsets.inc b/defaults-archsets.include
similarity index 100%
rename from archsets.inc
rename to defaults-archsets.include
diff --git a/conditionals.inc b/defaults-conditionals.include
similarity index 100%
rename from conditionals.inc
rename to defaults-conditionals.include
diff --git a/openSUSE-Addon-NonOss.product.in b/openSUSE-Addon-NonOss.product.in
index 18b5f4c..96060ca 100644
--- a/openSUSE-Addon-NonOss.product.in
+++ b/openSUSE-Addon-NonOss.product.in
@@ -72,7 +72,7 @@
         <repository path="obs://openSUSE:Factory/standard"/>
     </repositories>
 
-    <xi:include href="archsets.inc" />
+    <xi:include href="defaults-archsets.include" />
 
     <mediasets>
         <!-- BEWARE: do not touch this without adapting the upload scripts ! -->
@@ -98,6 +98,6 @@
         </media>
     </mediasets>
 
-    <xi:include href="conditionals.inc" />
+    <xi:include href="defaults-conditionals.include" />
     <xi:include href="NON_FTP_PACKAGES.group"/>
 </productdefinition>
diff --git a/openSUSE-Tumbleweed-Kubic.product.in b/openSUSE-Tumbleweed-Kubic.product.in
index 1c74d34..5702687 100644
--- a/openSUSE-Tumbleweed-Kubic.product.in
+++ b/openSUSE-Tumbleweed-Kubic.product.in
@@ -51,8 +51,8 @@
     </products>
 
 <!-- Default conditionals, repositories and archsets get imported -->
-    <xi:include href="conditionals.inc" />
-    <xi:include href="archsets.inc" />
+    <xi:include href="defaults-conditionals.include" />
+    <xi:include href="defaults-archsets.include" />
     <repositories>
       <repository path="obs://openSUSE:Factory/standard"/>
     </repositories>
diff --git a/openSUSE.product.in b/openSUSE.product.in
index b44ac85..a0cf78a 100644
--- a/openSUSE.product.in
+++ b/openSUSE.product.in
@@ -81,7 +81,7 @@
       </product>
     </products>
 
-    <xi:include href="conditionals.inc" />
+    <xi:include href="defaults-conditionals.include" />
 
     <repositories>
         <repository path="obs://openSUSE:Factory/standard"/>
@@ -89,7 +89,7 @@
         <repository path="obs://openSUSE:Factory:Containers/container"/>
     </repositories>
 
-    <xi:include href="archsets.inc" />
+    <xi:include href="defaults-archsets.include" />
 
     <mediasets>
         <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->