diff --git a/extra/groups.conf b/extra/groups.conf
index 37621b9..36dd29f 100644
--- a/extra/groups.conf
+++ b/extra/groups.conf
@@ -22,8 +22,8 @@
 			['%%V6'] = '20',
 			['%%N4'] = '10.90.64.1',
 			['%%MT'] = '1426',
-                        ['%%BS'] = '02:0E:8E:1E:61:02',
-                        ['%%NN'] = '16:41:95:40:f7:02',
+      ['%%BS'] = '02:0E:8E:1E:61:02',
+      ['%%NN'] = '16:41:95:40:f7:02',
 			['%%IB'] = 'mesh.ffrgb_uml',
 			['%%PRI'] = '185.53.218.132',
 			['%%SEC'] = '',
@@ -31,36 +31,36 @@
 			['%%SECKEY'] = '',
 		},
 	},
-        ffrgb_uml = {
-                subst = {
-                        ['%%ID'] = '03',
-                        ['%%V4'] = '10.90.96.0/19',
-                        ['%%V6'] = '30',
-                        ['%%N4'] = '10.90.96.1',
-                        ['%%MT'] = '1426',
-                        ['%%BS'] = '02:0E:8E:1E:61:02',
-                        ['%%NN'] = '16:41:95:40:f7:02',
-                        ['%%IB'] = 'mesh.ffrgb_test',
-                        ['%%PRI'] = '185.53.218.132',
-                        ['%%SEC'] = '',
-                        ['%%PRIKEY'] = '',
-                        ['%%SECKEY'] = '',
-                },
-        },
-        legacy = {
-                subst = {
-                        ['%%ID'] = '00',
-                        ['%%V4'] = '10.90.0.0/19',
-                        ['%%V6'] = '00',
-                        ['%%N4'] = '10.90.0.1',
-                        ['%%MT'] = '1426',
-                        ['%%BS'] = '02:0E:8E:1E:61:17',
-                        ['%%NN'] = '16:41:95:40:f7:dd',
-                        ['%%IB'] = 'mesh.ffrgb',
-                        ['%%PRI'] = '78.47.168.10',
-                        ['%%SEC'] = '213.166.225.5',
-                        ['%%PRIKEY'] = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-                        ['%%SECKEY'] = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-                },
-        },
+  ffrgb_test = {
+    subst = {
+      ['%%ID'] = '03',
+      ['%%V4'] = '10.90.96.0/19',
+      ['%%V6'] = '30',
+      ['%%N4'] = '10.90.96.1',
+      ['%%MT'] = '1426',
+      ['%%BS'] = '02:0E:8E:1E:61:02',
+      ['%%NN'] = '16:41:95:40:f7:02',
+      ['%%IB'] = 'mesh.ffrgb_test',
+      ['%%PRI'] = '185.53.218.132',
+      ['%%SEC'] = '',
+      ['%%PRIKEY'] = '',
+      ['%%SECKEY'] = '',
+    },
+  },
+  legacy = {
+    subst = {
+      ['%%ID'] = '00',
+      ['%%V4'] = '10.90.0.0/19',
+      ['%%V6'] = '00',
+      ['%%N4'] = '10.90.0.1',
+      ['%%MT'] = '1426',
+      ['%%BS'] = '02:0E:8E:1E:61:17',
+      ['%%NN'] = '16:41:95:40:f7:dd',
+      ['%%IB'] = 'mesh.ffrgb',
+      ['%%PRI'] = '78.47.168.10',
+      ['%%SEC'] = '213.166.225.5',
+      ['%%PRIKEY'] = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
+      ['%%SECKEY'] = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
+    },
+  },
 }
diff --git a/extra/sites.conf b/extra/sites.conf
index 1cc8b62..666e772 100644
--- a/extra/sites.conf
+++ b/extra/sites.conf
@@ -19,7 +19,7 @@
 {
 	{
 		site_name = 'Freifunk Regensburg - Legacy',
-		site_code = 'ffrgb',
+		site_code = 'ffrgb_legacy',
 		subst = {
 			['%%SS'] = 'regensburg.freifunk.net',
 		},
@@ -34,7 +34,7 @@
 			['%%SS'] = 'regensburg.freifunk.net',
 		},
 		site_select = {
-			group = 'ffrgb_city',
+			group = 'ffrgb_cty',
 		},
 	},
 	{
@@ -56,7 +56,7 @@
 		},
 		site_select = {
 			hidden = 1,
-			group = 'ffrgb_uml',
+			group = 'ffrgb_test',
 		},
 	},
 }
diff --git a/site.conf b/site.conf_obsolete
similarity index 100%
rename from site.conf
rename to site.conf_obsolete