[READY] Renaming switches and regrouping (#1160)

Author: kylerisse

switch-configuration/config/switchtypes

@@ -42,18 +42,18 @@ ExpoAW		24	103	2001:470:f026:103::200:24	Booth		W.9		Loud		ex4200-48p	00:26:88:6
 ExpoA1		25	103	2001:470:f026:103::200:25	Booth		W.9		Quiet		ex4200-48p	00:26:88:60:bc:80
 ExpoA2		26	103	2001:470:f026:103::200:26	Booth		W.9		Normal		ex4200-48p	00:26:88:7f:27:00
 ExpoA3		27	103	2001:470:f026:103::200:27	Booth		W.9		Normal		ex4200-48p	2c:21:72:95:e2:00
-ExpoA4		28	103	2001:470:f026:103::200:28	Booth		W.9		Loud		ex4200-48p	00:26:88:6e:c6:80
-ExpoA5		29	103	2001:470:f026:103::200:29	Booth		Z.9		Loud		ex4200-48p	28:c0:da:33:38:00
+ExpoD1		28	103	2001:470:f026:103::200:28	Booth		W.9		Loud		ex4200-48p	00:26:88:6e:c6:80
+ExpoD2		29	103	2001:470:f026:103::200:29	Booth		W.9		Loud		ex4200-48p	28:c0:da:33:38:00
 ExpoB1		30	103	2001:470:f026:103::200:30	Booth		W.9		Normal		ex4200-48p	00:26:88:7e:36:00
 ExpoB2		31	103	2001:470:f026:103::200:31	Booth		W.9		Quiet		ex4200-48p	00:26:88:7d:f5:80
 ExpoB3		32	103	2001:470:f026:103::200:32	Booth		W.9		Normal		ex4200-48p	00:26:88:7a:76:80
-ExpoB4		33	103	2001:470:f026:103::200:33	Booth		W.9		Normal		ex4200-48p	00:26:88:7d:f8:00
-ExpoB5		34	103	2001:470:f026:103::200:34	Booth		W.9		Loud		ex4200-48p	00:26:88:6f:1e:00
+ExpoB4		33	103	2001:470:f026:103::200:33	Booth		Z.9		Normal		ex4200-48p	00:26:88:7d:f8:00
+ExpoB5		34	103	2001:470:f026:103::200:34	Booth		Z.9		Loud		ex4200-48p	00:26:88:6f:1e:00
 ExpoC1		35	103	2001:470:f026:103::200:35	Booth		W.9		Loud		ex4200-48p	00:19:e2:56:23:3f
 ExpoC2		36	103	2001:470:f026:103::200:36	Booth		W.9		Normal		ex4200-48p	2c:6b:f5:39:cf:80
 ExpoC3		37	103	2001:470:f026:103::200:37	Booth		W.9		Quiet		ex4200-48p	2c:6b:f5:37:cd:00
-ExpoC4		38	103	2001:470:f026:103::200:38	Booth		W.9		Normal		ex4200-48p	00:26:88:7e:1b:80
-ExpoC5		39	103	2001:470:f026:103::200:39	Booth		W.9		Normal		ex4200-48p	00:26:88:70:d6:00
+ExpoC4		38	103	2001:470:f026:103::200:38	Booth		Z.9		Normal		ex4200-48p	00:26:88:7e:1b:80
+ExpoC5		39	103	2001:470:f026:103::200:39	Booth		Z.9		Normal		ex4200-48p	00:26:88:70:d6:00
 SpareI		40	103	2001:470:f026:103::200:40	exRoom		Z.9		Quiet		ex4200-48p	b0:c6:9a:64:85:80
 BallroomB	41	103	2001:470:f026:103::200:41	exRoom		C.9		Normal		ex4200-48p	00:26:88:70:bb:00
 BallroomC	42	103	2001:470:f026:103::200:42	exRoom		C.9		Normal		ex4200-48p	00:26:88:60:40:00