diff --git a/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp b/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp
index ee47fd7f70894f898fa0e6b5fcdaeb4b4633cd53..1c7fbe3efcb7d4bb54377757a5ad7c9027d8dff1 100644
--- a/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp
+++ b/src/Operators/Vector/tests/vector_dist_operators_tests_util.hpp
@@ -1216,7 +1216,7 @@ bool check_values_apply_kernel(vector & vd, Kernel & ker, NN_type & NN)
 		float prp_x = vd.template getProp<VC>(p) * vd.template getProp<VB>(p) + norm(vd.template getProp<VB>(p));
 
 		// For each neighborhood particle
-		auto Np = NN.getNNIterator(NN.getCell(xp));
+		auto Np = NN.getNNIteratorBox(NN.getCell(xp));
 
 		while (Np.isNext())
 		{
@@ -1278,7 +1278,7 @@ bool check_values_apply_kernel_reduce(vector & vd, Kernel & ker, NN_type & NN)
 		float prp_x = vd.template getProp<VC>(p) * vd.template getProp<VB>(p) + norm(vd.template getProp<VB>(p));
 
 		// For each neighborhood particle
-		auto Np = NN.getNNIterator(NN.getCell(xp));
+		auto Np = NN.getNNIteratorBox(NN.getCell(xp));
 
 		while (Np.isNext())
 		{
@@ -1353,7 +1353,7 @@ bool check_values_apply_kernel2(vector & vd, Kernel & ker, NN_type & NN)
 		Point<3,float> prp_x = 2.0 * vd.template getProp<VC>(p) + vd.template getProp<VB>(p);
 
 		// For each neighborhood particle
-		auto Np = NN.getNNIterator(NN.getCell(xp));
+		auto Np = NN.getNNIteratorBox(NN.getCell(xp));
 
 		while (Np.isNext())
 		{
@@ -1420,7 +1420,7 @@ bool check_values_apply_kernel3(vector & vd, Kernel & ker, NN_type & NN)
 		Point<3,float> prp_x = vd.template getProp<VC>(p);
 
 		// For each neighborhood particle
-		auto Np = NN.getNNIterator(NN.getCell(xp));
+		auto Np = NN.getNNIteratorBox(NN.getCell(xp));
 
 		while (Np.isNext())
 		{
@@ -1485,7 +1485,7 @@ bool check_values_apply_kernel2_reduce(vector & vd, Kernel & ker, NN_type & NN)
 		Point<3,float> prp_x = 2.0f*vd.template getProp<VC>(p) + vd.template getProp<VB>(p);
 
 		// For each neighborhood particle
-		auto Np = NN.getNNIterator(NN.getCell(xp));
+		auto Np = NN.getNNIteratorBox(NN.getCell(xp));
 
 		while (Np.isNext())
 		{
@@ -1562,7 +1562,7 @@ bool check_values_apply_kernel3_reduce(vector & vd, Kernel & ker, NN_type & NN,
 		Point<2,float> ker_accu = 0.0;
 
 		// For each neighborhood particle
-		auto Np = NN.getNNIterator(NN.getCell(xp));
+		auto Np = NN.getNNIteratorBox(NN.getCell(xp));
 
 		while (Np.isNext())
 		{
diff --git a/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp b/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
index c41c06535ce2484017391fc56751f438e2e899db..554df235e6e4a1528a6dc26793a38267c8f8dd8b 100644
--- a/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
+++ b/src/Operators/Vector/vector_dist_operators_apply_kernel.hpp
@@ -107,7 +107,7 @@ struct apply_kernel_is_number_or_expression
 	    rtype prp_p = v_exp.value(key);
 
 	    // Get the neighborhood of the particle
-	    auto NN = cl.getNNIterator(cl.getCell(p));
+	    auto NN = cl.getNNIteratorBox(cl.getCell(p));
 	    while(NN.isNext())
 	    {
 			auto nnp = NN.get();
@@ -163,7 +163,7 @@ struct apply_kernel_is_number_or_expression_sim
 	    Point<vector::dims,typename vector::stype> p = vd.getPos(key);
 
 	    // Get the neighborhood of the particle
-	    auto NN = cl.getNNIterator(cl.getCell(p));
+	    auto NN = cl.getNNIteratorBox(cl.getCell(p));
 	    while(NN.isNext())
 	    {
 			auto nnp = NN.get();
@@ -218,7 +218,7 @@ struct apply_kernel_is_number_or_expression_gen
 	    Point<vector::dims,typename vector::stype> p = vd.getPos(key);
 
 	    // Get the neighborhood of the particle
-	    auto NN = cl.getNNIterator(cl.getCell(p));
+	    auto NN = cl.getNNIteratorBox(cl.getCell(p));
 	    while(NN.isNext())
 	    {
 			auto nnp = NN.get();
diff --git a/src/PSE/Kernels_test_util.hpp b/src/PSE/Kernels_test_util.hpp
index 2bce5885b134dfa5964b3728a44edd0607d7413b..b7f5bf0984f97f9ebd88b8f05280de8400f791a5 100644
--- a/src/PSE/Kernels_test_util.hpp
+++ b/src/PSE/Kernels_test_util.hpp
@@ -123,7 +123,7 @@ template<typename T, typename Kernel> void PSE_test(size_t Npart, size_t overlap
     T prp_x = vd.template getProp<0>(key);
 
     // Get the neighborhood of the particles
-    auto NN = cl.template getNNIterator(cl.getCell(p));
+    auto NN = cl.template getNNIteratorBox(cl.getCell(p));
     while(NN.isNext())
     {
     	auto nnp = NN.get();
diff --git a/src/level_set/particle_cp/particle_cp.hpp b/src/level_set/particle_cp/particle_cp.hpp
index b8b5bb92f715b4cfc89340aacd1e9e96117f1577..978313cb13702e2a4e26e041eeb1d8a01199e2d5 100644
--- a/src/level_set/particle_cp/particle_cp.hpp
+++ b/src/level_set/particle_cp/particle_cp.hpp
@@ -150,7 +150,7 @@ private:
 			if (redistOptions.verbose) vd_in.template getProp<vd_in_close_part>(akey) = 0;
 			int isclose = 0;
 
-			auto Np = NN.getNNIterator(NN.getCell(xa));
+			auto Np = NN.getNNIteratorBox(NN.getCell(xa));
 			while (Np.isNext())
 			{
 				vect_dist_key_dx bkey = Np.get();
@@ -350,7 +350,7 @@ private:
 			Point<dim, double> xaa = vd_in.getPos(a);
 
 			// Now we will iterate over the sample points, which means iterating over vd_s.
-			auto Np = NN_s.getNNIterator(NN_s.getCell(vd_in.getPos(a)));
+			auto Np = NN_s.getNNIteratorBox(NN_s.getCell(vd_in.getPos(a)));
 
 			vect_dist_key_dx b_min = get_closest_neighbor<decltype(NN_s)>(xaa, vd_s, NN_s);
 
@@ -524,7 +524,7 @@ private:
 
 	template<typename NNlist_type> vect_dist_key_dx get_closest_neighbor(Point<dim, double> & xa, particles_surface<dim, n_c> & vd_surface, NNlist_type & NN_s)
 	{
-		auto Np = NN_s.getNNIterator(NN_s.getCell(xa));
+		auto Np = NN_s.getNNIteratorBox(NN_s.getCell(xa));
 
 		// distance is the the minimum distance to be beaten
                 double distance = 1000000.0;