diff --git a/src/PointNeighbors.jl b/src/PointNeighbors.jl
index 8c184006..2c53aef2 100644
--- a/src/PointNeighbors.jl
+++ b/src/PointNeighbors.jl
@@ -8,8 +8,8 @@ using Polyester: @batch
 
 include("util.jl")
 include("neighborhood_search.jl")
-include("trivial_nhs.jl")
-include("grid_nhs.jl")
+include("nhs_trivial.jl")
+include("nhs_grid.jl")
 
 export for_particle_neighbor
 export TrivialNeighborhoodSearch, GridNeighborhoodSearch
diff --git a/src/grid_nhs.jl b/src/nhs_grid.jl
similarity index 100%
rename from src/grid_nhs.jl
rename to src/nhs_grid.jl
diff --git a/src/trivial_nhs.jl b/src/nhs_trivial.jl
similarity index 100%
rename from src/trivial_nhs.jl
rename to src/nhs_trivial.jl
diff --git a/test/grid_nhs.jl b/test/nhs_grid.jl
similarity index 100%
rename from test/grid_nhs.jl
rename to test/nhs_grid.jl
diff --git a/test/trivial_nhs.jl b/test/nhs_trivial.jl
similarity index 100%
rename from test/trivial_nhs.jl
rename to test/nhs_trivial.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index 93c074de..75754388 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,6 +1,6 @@
 include("test_util.jl")
 
 @testset verbose=true "PointNeighbors.jl Tests" begin
-    include("trivial_nhs.jl")
-    include("grid_nhs.jl")
+    include("nhs_trivial.jl")
+    include("nhs_grid.jl")
 end