diff --git a/layout.yaml b/layout.yaml
index dbb5f9c..d7bee3f 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -4,7 +4,33 @@ teams:
   - name: fixed-string-region-id
     display_name: Human Readable Region Name
     teams:
-      - ABC
-      - SRZ1
-      - SRZ2
-      - SRZ3
+      - ABS
+      - BPV
+      - BRK
+      - CLY
+      - DCS
+      - GHS
+      - HAB
+      - HAM
+      - HAY
+      - HRO
+      - HRS
+      - HWM
+      - HZW
+      - JAG
+      - KEG
+      - KEV
+      - MAI
+      - MDN
+      - NHH
+      - PSC
+      - QMC
+      - RGS
+      - RTS
+      - SHK
+      - SOG
+      - THS
+      - TLC
+      - TMD
+      - WGS
+      - WMC
diff --git a/league.yaml b/league.yaml
index f14acf1..6f25fad 100644
--- a/league.yaml
+++ b/league.yaml
@@ -3,10 +3,4 @@
 # Match numbers are 0-N, preferably in order, and must not omit any values.
 # The list of teams is ordered -- zone 0 first up to the Nth zone.
 
-matches:
-  0:
-    main:
-      - SRZ2
-      - ABC
-      - SRZ1
-      - SRZ3
+matches: {}
diff --git a/teams.yaml b/teams.yaml
index b639d5e..36cb622 100644
--- a/teams.yaml
+++ b/teams.yaml
@@ -1,14 +1,91 @@
-# Mapping of teams at the competition, from their TLA to their properties.
 teams:
-    ABC:
-        name: Absolutely Brilliant College
+    ABS:
+        name: Abingdon School
         rookie: false
-    SRZ1:
-        name: Example team 1
+    BPV:
+        name: Barton Peveril College
         rookie: false
-    SRZ2:
-        name: Example team 2
+    BRK:
+        name: Brockenhurst College
         rookie: false
-    SRZ3:
-        name: Example team 3
+    CLY:
+        name: The College of Richard Collyer
+        rookie: false
+    DCS:
+        name: Dr Challoner's Grammar School
+        rookie: true
+    GHS:
+        name: Guildford High School
+        rookie: true
+    HAB:
+        name: Haberdashers’ Boys’ School
+        rookie: false
+    HAM:
+        name: Hampton School
+        rookie: false
+    HAY:
+        name: Haydon School
+        rookie: false
+    HRO:
+        name: Headington Rye School Oxford
+        rookie: false
+    HRS:
+        name: Hills Road Sixth Form College
+        rookie: false
+    HWM:
+        name: Harris Westminster Sixth Form
+        rookie: false
+    HZW:
+        name: Hazelwick School
+        rookie: false
+    JAG:
+        name: James Allen's Girls' School
+        rookie: true
+    KEG:
+        name: King Edward VI Grammar School
+        rookie: false
+    KEV:
+        name: King Edward VI School
+        rookie: false
+    MAI:
+        name: Gymnasium Markt Indersdorf
+        rookie: false
+    MDN:
+        name: Midsomer Norton Friends
+        rookie: true
+    NHH:
+        name: Nower Hill School
+        rookie: true
+    PSC:
+        name: Peter Symonds College
+        rookie: false
+    QMC:
+        name: Queen Mary's College
+        rookie: false
+    RGS:
+        name: Royal Grammar School Guildford
+        rookie: false
+    RTS:
+        name: Ruthin School
+        rookie: false
+    SHK:
+        name: School of St Helen and St Katharine
+        rookie: true
+    SOG:
+        name: Saint Olaves Grammar School
+        rookie: false
+    THS:
+        name: The Highfield School
+        rookie: true
+    TLC:
+        name: The Ladies College
+        rookie: false
+    TMD:
+        name: Tormead School
+        rookie: true
+    WGS:
+        name: Wisbech Grammar School
+        rookie: false
+    WMC:
+        name: Westminster City School
         rookie: false