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 b/openSUSE-Addon-NonOss.product
index 269bfa11..488187c9 100644
--- a/openSUSE-Addon-NonOss.product
+++ b/openSUSE-Addon-NonOss.product
@@ -72,7 +72,7 @@
         <repository path="obs://openSUSE:Factory/standard"/>
     </repositories>
 
-    <xi:include href="archsets.inc" />
+    <xi:include href="defaults-archsets.include" />
 
     <mediasets>
         <media type="cd" 
@@ -124,7 +124,7 @@
         </media>
     </mediasets>
 
-    <xi:include href="conditionals.inc" />
+    <xi:include href="defaults-conditionals.include" />
     <xi:include href="openSUSE-Addon-NonOss.group" />
     <xi:include href="openSUSE-Addon-NonOss-x86_64.group"/>
     <xi:include href="openSUSE-Addon-NonOss-Deps.group" />
diff --git a/openSUSE-Tumbleweed-Kubic.product b/openSUSE-Tumbleweed-Kubic.product
index 04e4afd5..4972d60c 100644
--- a/openSUSE-Tumbleweed-Kubic.product
+++ b/openSUSE-Tumbleweed-Kubic.product
@@ -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 b/openSUSE.product
index 4d8b7dfb..884f6a46 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -82,14 +82,14 @@
       </product>
     </products>
 
-    <xi:include href="conditionals.inc" />
+    <xi:include href="defaults-conditionals.include" />
 
     <repositories>
         <repository path="obs://openSUSE:Factory/standard"/>
         <repository path="obs://openSUSE:Factory:Live/standard"/>
     </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 ! -->