diff -Nur anaconda-13.21.239/storage/__init__.py anaconda-13.21.239_bz9080/storage/__init__.py
--- anaconda-13.21.239/storage/__init__.py	2015-09-30 11:38:16.573437546 +0200
+++ anaconda-13.21.239_bz9080/storage/__init__.py	2015-09-30 11:40:58.476522195 +0200
@@ -968,7 +968,7 @@
         vgnames = [vg.name for vg in self.vgs]
         if hn is not None and hn != '':
             if hn == 'localhost' or hn == 'localhost.localdomain':
-                vgtemplate = "VolGroup"
+                vgtemplate = "main"
             elif hn.find('.') != -1:
                 template = "vg_%s" % (hn.split('.')[0].lower(),)
                 vgtemplate = safeLvmName(template)
@@ -976,7 +976,7 @@
                 template = "vg_%s" % (hn.lower(),)
                 vgtemplate = safeLvmName(template)
         else:
-            vgtemplate = "VolGroup"
+            vgtemplate = "main"
 
         if vgtemplate not in vgnames and \
                 vgtemplate not in lvm.lvm_vg_blacklist:
@@ -1001,12 +1001,12 @@
         if mountpoint:
             # try to incorporate the mountpoint into the name
             if mountpoint == '/':
-                lvtemplate = 'lv_root'
+                lvtemplate = 'root'
             else:
                 if mountpoint.startswith("/"):
-                    template = "lv_%s" % mountpoint[1:]
+                    template = "%s" % mountpoint[1:]
                 else:
-                    template = "lv_%s" % (mountpoint,)
+                    template = "%s" % (mountpoint,)
 
                 lvtemplate = safeLvmName(template)
         else:
@@ -1014,13 +1014,13 @@
                 if len([s for s in self.swaps if s in vg.lvs]):
                     idx = len([s for s in self.swaps if s in vg.lvs])
                     while True:
-                        lvtemplate = "lv_swap%02d" % idx
+                        lvtemplate = "swap%02d" % idx
                         if lvtemplate in [lv.lvname for lv in vg.lvs]:
                             idx += 1
                         else:
                             break
                 else:
-                    lvtemplate = "lv_swap"
+                    lvtemplate = "swap"
             elif pool:
                 pool_count = len([p for p in self.thinpools if p in vg.lvs])
                 if pool_count: