diff --git a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
index a1455fe4..704be093 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
@@ -31,7 +31,7 @@
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.region.ApplicableRegionSet;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 /**
  * This processes per-player state information and is also meant to be used
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java b/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java
index ae1bb839..7ed450fb 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java
@@ -28,7 +28,7 @@
 import java.io.OutputStream;
 import org.bukkit.World;
 
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.stores.LegacyCsvStore;
 import com.sk89q.worldguard.region.stores.ProtectionDatabaseException;
 
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java
index c50ed1c4..02136e29 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java
@@ -27,7 +27,7 @@
 import com.sk89q.worldguard.region.ApplicableRegionSet;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 public class RegionQueryUtil {
 
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java
index 2d0d8ad8..eb576721 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java
@@ -39,7 +39,7 @@
 import com.sk89q.worldguard.region.flags.DefaultFlag;
 import com.sk89q.worldguard.region.flags.Flag;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.ProtectedRegion;
 import com.sk89q.worldguard.util.LogListBlock;
 
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
index 9b268d64..31c76ddd 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
@@ -99,7 +99,7 @@
 import com.sk89q.worldguard.bukkit.resolvers.TargetBlockResolver;
 import com.sk89q.worldguard.bukkit.resolvers.TargetEntityResolver;
 import com.sk89q.worldguard.region.RegionManager;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
 
 /**
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java
index 6a38765c..a1fb562b 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java
@@ -34,7 +34,7 @@
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.region.ApplicableRegionSet;
 import com.sk89q.worldguard.region.flags.*;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.region.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.region.regions.ProtectedPolygonalRegion;
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java
index 00e13b3d..b7669520 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java
@@ -31,7 +31,7 @@
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.ProtectedRegion;
 import com.sk89q.worldguard.region.stores.ProtectionDatabaseException;
 import com.sk89q.worldguard.region.stores.RegionDBUtil;
diff --git a/src/main/java/com/sk89q/worldguard/region/RegionManager.java b/src/main/java/com/sk89q/worldguard/region/RegionManager.java
index 32a43bf6..fc5ce350 100644
--- a/src/main/java/com/sk89q/worldguard/region/RegionManager.java
+++ b/src/main/java/com/sk89q/worldguard/region/RegionManager.java
@@ -38,8 +38,8 @@
 import com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.PriorityRTreeIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.PriorityRTreeIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.stores.MySQLStore;
 import com.sk89q.worldguard.region.stores.ProtectionDatabaseException;
 import com.sk89q.worldguard.region.stores.RegionStore;
diff --git a/src/main/java/com/sk89q/worldguard/region/RegionQueryCacheEntry.java b/src/main/java/com/sk89q/worldguard/region/RegionQueryCacheEntry.java
index c69125ed..e9e32329 100644
--- a/src/main/java/com/sk89q/worldguard/region/RegionQueryCacheEntry.java
+++ b/src/main/java/com/sk89q/worldguard/region/RegionQueryCacheEntry.java
@@ -23,7 +23,7 @@
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.ProtectedRegion;
 
 /**
diff --git a/src/main/java/com/sk89q/worldguard/region/indexes/AbstractRegionIndex.java b/src/main/java/com/sk89q/worldguard/region/indices/AbstractRegionIndex.java
similarity index 97%
rename from src/main/java/com/sk89q/worldguard/region/indexes/AbstractRegionIndex.java
rename to src/main/java/com/sk89q/worldguard/region/indices/AbstractRegionIndex.java
index 2b6c1953..43d9e97b 100644
--- a/src/main/java/com/sk89q/worldguard/region/indexes/AbstractRegionIndex.java
+++ b/src/main/java/com/sk89q/worldguard/region/indices/AbstractRegionIndex.java
@@ -16,7 +16,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldguard.region.indexes;
+package com.sk89q.worldguard.region.indices;
 
 import java.util.Collection;
 
diff --git a/src/main/java/com/sk89q/worldguard/region/indexes/FlatIndex.java b/src/main/java/com/sk89q/worldguard/region/indices/FlatIndex.java
similarity index 98%
rename from src/main/java/com/sk89q/worldguard/region/indexes/FlatIndex.java
rename to src/main/java/com/sk89q/worldguard/region/indices/FlatIndex.java
index cb5b813e..0f560dcf 100644
--- a/src/main/java/com/sk89q/worldguard/region/indexes/FlatIndex.java
+++ b/src/main/java/com/sk89q/worldguard/region/indices/FlatIndex.java
@@ -16,7 +16,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldguard.region.indexes;
+package com.sk89q.worldguard.region.indices;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.region.UnsupportedIntersectionException;
diff --git a/src/main/java/com/sk89q/worldguard/region/indexes/PriorityRTreeIndex.java b/src/main/java/com/sk89q/worldguard/region/indices/PriorityRTreeIndex.java
similarity index 98%
rename from src/main/java/com/sk89q/worldguard/region/indexes/PriorityRTreeIndex.java
rename to src/main/java/com/sk89q/worldguard/region/indices/PriorityRTreeIndex.java
index e9d3c3e2..4b313c1c 100644
--- a/src/main/java/com/sk89q/worldguard/region/indexes/PriorityRTreeIndex.java
+++ b/src/main/java/com/sk89q/worldguard/region/indices/PriorityRTreeIndex.java
@@ -16,7 +16,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldguard.region.indexes;
+package com.sk89q.worldguard.region.indices;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.region.UnsupportedIntersectionException;
diff --git a/src/main/java/com/sk89q/worldguard/region/indexes/RegionIndex.java b/src/main/java/com/sk89q/worldguard/region/indices/RegionIndex.java
similarity index 99%
rename from src/main/java/com/sk89q/worldguard/region/indexes/RegionIndex.java
rename to src/main/java/com/sk89q/worldguard/region/indices/RegionIndex.java
index 9f92744c..e2bad41d 100644
--- a/src/main/java/com/sk89q/worldguard/region/indexes/RegionIndex.java
+++ b/src/main/java/com/sk89q/worldguard/region/indices/RegionIndex.java
@@ -16,7 +16,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldguard.region.indexes;
+package com.sk89q.worldguard.region.indices;
 
 import java.util.Collection;
 import com.sk89q.worldedit.Vector;
diff --git a/src/main/java/com/sk89q/worldguard/region/stores/AbstractProtectionDatabase.java b/src/main/java/com/sk89q/worldguard/region/stores/AbstractProtectionDatabase.java
index 61f7d3aa..8f653e25 100644
--- a/src/main/java/com/sk89q/worldguard/region/stores/AbstractProtectionDatabase.java
+++ b/src/main/java/com/sk89q/worldguard/region/stores/AbstractProtectionDatabase.java
@@ -19,7 +19,7 @@
 
 package com.sk89q.worldguard.region.stores;
 
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 public abstract class AbstractProtectionDatabase implements RegionStore {
 
diff --git a/src/main/java/com/sk89q/worldguard/region/stores/RegionStore.java b/src/main/java/com/sk89q/worldguard/region/stores/RegionStore.java
index 28f708f6..bc755178 100644
--- a/src/main/java/com/sk89q/worldguard/region/stores/RegionStore.java
+++ b/src/main/java/com/sk89q/worldguard/region/stores/RegionStore.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.ProtectedRegion;
 
 /**
diff --git a/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java b/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java
index 5170528c..7a205a92 100644
--- a/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java
@@ -26,8 +26,8 @@
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.FlatIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.FlatIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.region.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.region.regions.ProtectedPolygonalRegion;
diff --git a/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java b/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java
index 70d0c1ef..77d619dd 100644
--- a/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.worldguard.protection;
 
-import com.sk89q.worldguard.region.indexes.FlatIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.FlatIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 public class FlatRegionOverlapTest extends RegionOverlapTest {
     protected RegionIndex createRegionManager() throws Exception {
diff --git a/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java b/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java
index 6be2178d..eb2ee4db 100644
--- a/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.worldguard.protection;
 
-import com.sk89q.worldguard.region.indexes.FlatIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.FlatIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 public class FlatRegionPriorityTest extends RegionPriorityTest {
     protected RegionIndex createRegionManager() throws Exception {
diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java
index 7c66496e..2dd9358e 100644
--- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java
@@ -26,8 +26,8 @@
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.PriorityRTreeIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.PriorityRTreeIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.region.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.region.regions.ProtectedPolygonalRegion;
diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java
index 7a7f864c..34b3bf5b 100644
--- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.worldguard.protection;
 
-import com.sk89q.worldguard.region.indexes.PriorityRTreeIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.PriorityRTreeIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 public class PRTreeRegionOverlapTest extends RegionOverlapTest {
     protected RegionIndex createRegionManager() throws Exception {
diff --git a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java
index 4430b69c..de3a0f84 100644
--- a/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.worldguard.protection;
 
-import com.sk89q.worldguard.region.indexes.PriorityRTreeIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.PriorityRTreeIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 
 public class PRTreeRegionPriorityTest extends RegionPriorityTest {
     protected RegionIndex createRegionManager() throws Exception {
diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java b/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java
index 481d100e..7245c157 100644
--- a/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java
@@ -27,8 +27,8 @@
 import com.sk89q.worldguard.region.ApplicableRegionSet;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.FlatIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.FlatIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.region.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.region.regions.ProtectedPolygonalRegion;
diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java b/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java
index 50fbd6ae..0cd61698 100644
--- a/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java
+++ b/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java
@@ -29,8 +29,8 @@
 import com.sk89q.worldguard.region.ApplicableRegionSet;
 import com.sk89q.worldguard.region.flags.DefaultFlag;
 import com.sk89q.worldguard.region.flags.StateFlag;
-import com.sk89q.worldguard.region.indexes.FlatIndex;
-import com.sk89q.worldguard.region.indexes.RegionIndex;
+import com.sk89q.worldguard.region.indices.FlatIndex;
+import com.sk89q.worldguard.region.indices.RegionIndex;
 import com.sk89q.worldguard.region.regions.*;
 
 import org.junit.Test;