diff --git a/NewHorizons/Builder/Volumes/MapRestrictionVolumeBuilder.cs b/NewHorizons/Builder/Volumes/VolumeBuilder.cs
similarity index 62%
rename from NewHorizons/Builder/Volumes/MapRestrictionVolumeBuilder.cs
rename to NewHorizons/Builder/Volumes/VolumeBuilder.cs
index 53e5944f..c8fc563f 100644
--- a/NewHorizons/Builder/Volumes/MapRestrictionVolumeBuilder.cs
+++ b/NewHorizons/Builder/Volumes/VolumeBuilder.cs
@@ -1,18 +1,14 @@
 using NewHorizons.Components;
 using NewHorizons.External.Modules;
-using OWML.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes
 {
-    public static class MapRestrictionVolumeBuilder
+    public static class VolumeBuilder
     {
-        public static MapRestrictionVolume Make(GameObject planetGO, Sector sector, VolumesModule.VolumeInfo info)
+        public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumesModule.VolumeInfo info) where TVolume : BaseVolume
         {
-            var go = new GameObject("MapRestrictionVolume");
+            var go = new GameObject(typeof(TVolume).Name);
             go.SetActive(false);
 
             go.transform.parent = sector?.transform ?? planetGO.transform;
@@ -25,11 +21,11 @@ namespace NewHorizons.Builder.Volumes
             var owTriggerVolume = go.AddComponent<OWTriggerVolume>();
             owTriggerVolume._shape = shape;
 
-            var mapRestrictionVolume = go.AddComponent<MapRestrictionVolume>();
+            var volume = go.AddComponent<TVolume>();
 
             go.SetActive(true);
 
-            return mapRestrictionVolume;
+            return volume;
         }
     }
 }
diff --git a/NewHorizons/Builder/Volumes/VolumesBuildManager.cs b/NewHorizons/Builder/Volumes/VolumesBuildManager.cs
index 343ccc0c..f4878c80 100644
--- a/NewHorizons/Builder/Volumes/VolumesBuildManager.cs
+++ b/NewHorizons/Builder/Volumes/VolumesBuildManager.cs
@@ -1,6 +1,7 @@
 using NewHorizons.Builder.Body;
 using NewHorizons.Builder.ShipLog;
 using NewHorizons.Builder.Volumes;
+using NewHorizons.Components;
 using NewHorizons.External.Configs;
 using OWML.Common;
 using System;
@@ -53,7 +54,7 @@ namespace NewHorizons.Builder.Volumes
             {
                 foreach (var mapRestrictionVolume in config.Volumes.mapRestrictionVolumes)
                 {
-                    MapRestrictionVolumeBuilder.Make(go, sector, mapRestrictionVolume);
+                    VolumeBuilder.Make<MapRestrictionVolume>(go, sector, mapRestrictionVolume);
                 }
             }
         }