diff --git a/src/lib/browse/HospitalsLayerToggle.svelte b/src/lib/browse/HospitalsLayerControl.svelte
similarity index 69%
rename from src/lib/browse/HospitalsLayerToggle.svelte
rename to src/lib/browse/HospitalsLayerControl.svelte
index 59bb3f4c4..25deab557 100644
--- a/src/lib/browse/HospitalsLayerToggle.svelte
+++ b/src/lib/browse/HospitalsLayerControl.svelte
@@ -1,9 +1,13 @@
 <script lang="ts">
   import { ExternalLink } from "../common";
-  import OptionalLayerToggle from "./OptionalLayerToggle.svelte";
+  import PolygonAmenityLayerControl from "./PolygonAmenityLayerControl.svelte";
 </script>
 
-<OptionalLayerToggle name="hospitals" singularNoun="hospital" pluralNoun="Hospitals">
+<PolygonAmenityLayerControl
+  name="hospitals"
+  singularNoun="hospital"
+  pluralNoun="Hospitals"
+>
   <p>
     This shows <ExternalLink
       href="https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital"
@@ -17,4 +21,4 @@
       Open Data Commons Open Database License
     </ExternalLink>
   </p>
-</OptionalLayerToggle>
+</PolygonAmenityLayerControl>
diff --git a/src/lib/browse/MrnLayerToggle.svelte b/src/lib/browse/MrnLayerControl.svelte
similarity index 100%
rename from src/lib/browse/MrnLayerToggle.svelte
rename to src/lib/browse/MrnLayerControl.svelte
diff --git a/src/lib/browse/ParliamentaryConstituenciesLayer.svelte b/src/lib/browse/ParliamentaryConstituenciesLayerControl.svelte
similarity index 100%
rename from src/lib/browse/ParliamentaryConstituenciesLayer.svelte
rename to src/lib/browse/ParliamentaryConstituenciesLayerControl.svelte
diff --git a/src/lib/browse/OptionalLayerToggle.svelte b/src/lib/browse/PolygonAmenityLayerControl.svelte
similarity index 100%
rename from src/lib/browse/OptionalLayerToggle.svelte
rename to src/lib/browse/PolygonAmenityLayerControl.svelte
diff --git a/src/lib/browse/SchoolsLayerToggle.svelte b/src/lib/browse/SchoolsLayerControl.svelte
similarity index 71%
rename from src/lib/browse/SchoolsLayerToggle.svelte
rename to src/lib/browse/SchoolsLayerControl.svelte
index d88be9de1..217774afa 100644
--- a/src/lib/browse/SchoolsLayerToggle.svelte
+++ b/src/lib/browse/SchoolsLayerControl.svelte
@@ -1,9 +1,13 @@
 <script lang="ts">
   import { ExternalLink } from "../common";
-  import OptionalLayerToggle from "./OptionalLayerToggle.svelte";
+  import PolygonAmenityLayerControl from "./PolygonAmenityLayerControl.svelte";
 </script>
 
-<OptionalLayerToggle name="schools" singularNoun="school" pluralNoun="Schools">
+<PolygonAmenityLayerControl
+  name="schools"
+  singularNoun="school"
+  pluralNoun="Schools"
+>
   <p>
     This shows <ExternalLink
       href="https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool"
@@ -17,4 +21,4 @@
       Open Data Commons Open Database License
     </ExternalLink>
   </p>
-</OptionalLayerToggle>
+</PolygonAmenityLayerControl>
diff --git a/src/pages/BrowseSchemes.svelte b/src/pages/BrowseSchemes.svelte
index e846b70a0..5e2bb43b6 100644
--- a/src/pages/BrowseSchemes.svelte
+++ b/src/pages/BrowseSchemes.svelte
@@ -6,14 +6,12 @@
   import { onDestroy, onMount } from "svelte";
   import { processInput, type Scheme } from "../lib/browse/data";
   import Filters from "../lib/browse/Filters.svelte";
-  import HospitalsLayer from "../lib/browse/HospitalsLayer.svelte";
+  import HospitalsLayerControl from "../lib/browse/HospitalsLayerControl.svelte";
   import InterventionColorSelector from "../lib/browse/InterventionColorSelector.svelte";
+  import MrnLayerControl from "../lib/browse/MrnLayerControl.svelte";
+  import ParliamentaryConstituenciesLayerControl from "../lib/browse/ParliamentaryConstituenciesLayerControl.svelte";
   import SchemeCard from "../lib/browse/SchemeCard.svelte";
-  import HospitalsLayerToggle from "../lib/browse/HospitalsLayerToggle.svelte";
-  import MrnLayerToggle from "../lib/browse/MrnLayerToggle.svelte";
-  import ParliamentaryConstituenciesLayer from "../lib/browse/ParliamentaryConstituenciesLayer.svelte";
-  import SchoolsLayerToggle from "../lib/browse/SchoolsLayerToggle.svelte";
-  import StyleInterventions from "../lib/browse/StyleInterventions.svelte";
+  import SchoolsLayerControl from "../lib/browse/SchoolsLayerControl.svelte";
   import {
     BaselayerSwitcher,
     CollapsibleCard,
@@ -140,10 +138,10 @@
           <InterventionColorSelector />
           <hr />
           <CheckboxGroup small>
-            <SchoolsLayerToggle />
-            <HospitalsLayerToggle />
-            <MrnLayerToggle />
-            <ParliamentaryConstituenciesLayer />
+            <SchoolsLayerControl />
+            <HospitalsLayerControl />
+            <MrnLayerControl />
+            <ParliamentaryConstituenciesLayerControl />
           </CheckboxGroup>
           <BaselayerSwitcher {style} />
         </CollapsibleCard>