diff --git a/openSUSE-Addon-NonOss.product.in b/openSUSE-Addon-NonOss.product.in
index 6b575b1..b7194b1 100644
--- a/openSUSE-Addon-NonOss.product.in
+++ b/openSUSE-Addon-NonOss.product.in
@@ -78,7 +78,7 @@
                name="openSUSE-Addon-NonOss-FTP" 
                flavor="ftp"
                sourcemedia="2"
-               mediastyle="suse-tumbleweed"
+               mediastyle="openSUSE"
                use_required="true" 
                use_recommended="true" 
                use_undecided="true"
diff --git a/openSUSE-MicroOS.product.in b/openSUSE-MicroOS.product.in
index 08a6007..41c4d4d 100644
--- a/openSUSE-MicroOS.product.in
+++ b/openSUSE-MicroOS.product.in
@@ -56,7 +56,7 @@
       name="openSUSE-MicroOS-DVD"
       sourcemedia="0"
       firmware="uefi"
-      mediastyle="suse-tumbleweed"
+      mediastyle="openSUSE"
       run_hybridiso="true"
       run_media_check="true"
       use_undecided="false"
@@ -83,7 +83,7 @@
       name="openSUSE-Kubic-DVD"
       sourcemedia="0"
       firmware="uefi"
-      mediastyle="suse-tumbleweed"
+      mediastyle="openSUSE"
       run_hybridiso="true"
       run_media_check="true"
       use_undecided="false"
@@ -105,14 +105,14 @@
     
     <media type="image"
          flavor="appliance"
-         mediastyle="suse-tumbleweed"
+         mediastyle="openSUSE"
          name="openSUSE-MicroOS-appliance" >
     <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
          flavor="appliance-kubic"
-         mediastyle="suse-tumbleweed"
+         mediastyle="openSUSE"
          name="openSUSE-Kubic-appliance" >
     <!-- Create no product media, but a flavor release subpackage -->
     </media>
diff --git a/openSUSE.product.in b/openSUSE.product.in
index 7593563..9d0c5c3 100644
--- a/openSUSE.product.in
+++ b/openSUSE.product.in
@@ -84,7 +84,7 @@
 
   <mediasets>
     <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
-    <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="suse-tumbleweed"
+    <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="openSUSE"
            create_pattern="false" repo_only="true" run_make_listings="true"
            use_required="true" use_recommended="true" use_suggested="false" use_undecided="true">
 
@@ -113,7 +113,7 @@
 
     <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
     <media type="cd" flavor="mini" name="openSUSE-Tumbleweed-NET" run_hybridiso="true"
-           mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
+           mediastyle="openSUSE" sourcemedia="0" firmware="uefi"
            use_required="true" use_recommended="true" use_suggested="false">
       <archsets>
         <archset ref="x86_64"/>
@@ -128,7 +128,7 @@
     </media>
 
     <media type="dvd5" flavor="dvd" name="openSUSE-Tumbleweed-DVD" run_hybridiso="true"
-           mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
+           mediastyle="openSUSE" sourcemedia="0" firmware="uefi"
            run_media_check="true" use_required="true" use_recommended="true" use_suggested="false">
 
       <use group="dvd" create_pattern="false"/>
@@ -154,93 +154,93 @@
       </metadata>
     </media>
 
-    <media type="cd" flavor="livecd-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-kde">
+    <media type="cd" flavor="livecd-kde" mediastyle="openSUSE" name="openSUSE-Tumbleweed-livecd-kde">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-    <media type="cd" flavor="livecd-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-x11">
+    <media type="cd" flavor="livecd-x11" mediastyle="openSUSE" name="openSUSE-Tumbleweed-livecd-x11">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-    <media type="cd" flavor="livecd-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-gnome">
+    <media type="cd" flavor="livecd-gnome" mediastyle="openSUSE" name="openSUSE-Tumbleweed-livecd-gnome">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-    <media type="cd" flavor="livecd-xfce" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-xfce">
+    <media type="cd" flavor="livecd-xfce" mediastyle="openSUSE" name="openSUSE-Tumbleweed-livecd-xfce">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-    <media type="cd" flavor="usb-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-kde">
+    <media type="cd" flavor="usb-kde" mediastyle="openSUSE" name="openSUSE-Tumbleweed-usb-kde">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-    <media type="cd" flavor="usb-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-gnome">
+    <media type="cd" flavor="usb-gnome" mediastyle="openSUSE" name="openSUSE-Tumbleweed-usb-gnome">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-    <media type="cd" flavor="usb-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-x11">
+    <media type="cd" flavor="usb-x11" mediastyle="openSUSE" name="openSUSE-Tumbleweed-usb-x11">
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance"
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance" >
            <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-docker" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-docker" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-kvm" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-kvm" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-vmware" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-vmware" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-openstack" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-openstack" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-hyperv" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-hyperv" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-vagrant" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-vagrant" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-wsl" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-wsl" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
     <media type="image"
            flavor="appliance-custom" 
-           mediastyle="suse-tumbleweed"
+           mediastyle="openSUSE"
            name="openSUSE-Tumbleweed-appliance-custom" >
        <!-- Create no product media, but a flavor release subpackage -->
     </media>