diff --git a/fedora.conf b/fedora.conf
index f46e7fd..0efb05c 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -315,7 +315,7 @@ image_build = {
 live_media = {
     '^Workstation$': [
             {
-                'name': 'Fedora-Live-Workstation',
+                'name': 'Fedora-Workstation-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -328,7 +328,7 @@ live_media = {
         ],
     '^Spins': [
             {
-                'name': 'Fedora-Live-KDE',
+                'name': 'Fedora-KDE-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -340,7 +340,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Xfce',
+                'name': 'Fedora-Xfce-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -352,7 +352,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-SoaS',
+                'name': 'Fedora-SoaS-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -364,7 +364,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Cinnamon',
+                'name': 'Fedora-Cinnamon-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -376,7 +376,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-LXDE',
+                'name': 'Fedora-LXDE-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -388,7 +388,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-MATE_Compiz',
+                'name': 'Fedora-MATE_Compiz-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -402,7 +402,7 @@ live_media = {
         ],
     '^Labs$': [
             {
-                'name': 'Fedora-Live-Astronomy_KDE',
+                'name': 'Fedora-Astronomy_KDE-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -414,7 +414,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Design_suite',
+                'name': 'Fedora-Design_suite-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -426,7 +426,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Scientific_KDE',
+                'name': 'Fedora-Scientific_KDE-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -438,7 +438,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Games',
+                'name': 'Fedora-Games-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -450,7 +450,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Security',
+                'name': 'Fedora-Security-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -462,7 +462,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Jam_KDE',
+                'name': 'Fedora-Jam_KDE-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically
@@ -474,7 +474,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             },
             {
-                'name': 'Fedora-Live-Robotics',
+                'name': 'Fedora-Robotics-Live',
                 'target': 'f25',
                 'version': 'Rawhide',
                 # correct SHA1 hash will be put into the URL below automatically