diff --git a/src/main/java/baritone/cache/Waypoints.java b/src/main/java/baritone/cache/WaypointCollection.java
similarity index 97%
rename from src/main/java/baritone/cache/Waypoints.java
rename to src/main/java/baritone/cache/WaypointCollection.java
index 2122ddaf..ef319602 100644
--- a/src/main/java/baritone/cache/Waypoints.java
+++ b/src/main/java/baritone/cache/WaypointCollection.java
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  *
  * @author leijurv
  */
-public class Waypoints implements IWaypointCollection {
+public class WaypointCollection implements IWaypointCollection {
 
     /**
      * Magic value to detect invalid waypoint files
@@ -42,7 +42,7 @@ public class Waypoints implements IWaypointCollection {
     private final Path directory;
     private final Map<IWaypoint.Tag, Set<IWaypoint>> waypoints;
 
-    Waypoints(Path directory) {
+    WaypointCollection(Path directory) {
         this.directory = directory;
         if (!Files.exists(directory)) {
             try {
diff --git a/src/main/java/baritone/cache/WorldData.java b/src/main/java/baritone/cache/WorldData.java
index 151edd4c..30fe8bd0 100644
--- a/src/main/java/baritone/cache/WorldData.java
+++ b/src/main/java/baritone/cache/WorldData.java
@@ -34,7 +34,7 @@ import java.nio.file.Path;
 public class WorldData implements IWorldData {
 
     public final CachedWorld cache;
-    private final Waypoints waypoints;
+    private final WaypointCollection waypoints;
     private final ContainerMemory containerMemory;
     //public final MapData map;
     public final Path directory;
@@ -43,7 +43,7 @@ public class WorldData implements IWorldData {
     WorldData(Path directory, int dimension) {
         this.directory = directory;
         this.cache = new CachedWorld(directory.resolve("cache"), dimension);
-        this.waypoints = new Waypoints(directory.resolve("waypoints"));
+        this.waypoints = new WaypointCollection(directory.resolve("waypoints"));
         this.containerMemory = new ContainerMemory(directory.resolve("containers"));
         this.dimension = dimension;
     }