diff --git a/src/LuaEngine/methods/UnitMethods.h b/src/LuaEngine/methods/UnitMethods.h
index 51fa341..6f4ccdb 100644
--- a/src/LuaEngine/methods/UnitMethods.h
+++ b/src/LuaEngine/methods/UnitMethods.h
@@ -1114,7 +1114,7 @@ namespace LuaUnit
 
         Acore::AnyFriendlyUnitInObjectRangeCheck checker(unit, unit, range);
         Acore::UnitListSearcher<Acore::AnyFriendlyUnitInObjectRangeCheck> searcher(unit, list, checker);
-        Cell::VisitAllObjects(unit, searcher, range);
+        Cell::VisitObjects(unit, searcher, range);
 
         ElunaUtil::ObjectGUIDCheck guidCheck(unit->GET_GUID());
         list.remove_if(guidCheck);
@@ -1146,7 +1146,7 @@ namespace LuaUnit
         std::list<Unit*> list;
         Acore::AnyUnfriendlyUnitInObjectRangeCheck checker(unit, unit, range);
         Acore::UnitListSearcher<Acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(unit, list, checker);
-        Cell::VisitAllObjects(unit, searcher, range);
+        Cell::VisitObjects(unit, searcher, range);
         ElunaUtil::ObjectGUIDCheck guidCheck(unit->GET_GUID());
         list.remove_if(guidCheck);
 
diff --git a/src/LuaEngine/methods/WorldObjectMethods.h b/src/LuaEngine/methods/WorldObjectMethods.h
index 6cacb16..d4a0217 100644
--- a/src/LuaEngine/methods/WorldObjectMethods.h
+++ b/src/LuaEngine/methods/WorldObjectMethods.h
@@ -183,7 +183,7 @@ namespace LuaWorldObject
         ElunaUtil::WorldObjectInRangeCheck checker(true, obj, range, TYPEMASK_PLAYER, 0, hostile, dead);
 
         Acore::UnitLastSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, target, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         Eluna::Push(L, target);
         return 1;
@@ -208,7 +208,7 @@ namespace LuaWorldObject
         ElunaUtil::WorldObjectInRangeCheck checker(true, obj, range, TYPEMASK_GAMEOBJECT, entry, hostile);
 
         Acore::GameObjectLastSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, target, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         Eluna::Push(L, target);
         return 1;
@@ -235,7 +235,7 @@ namespace LuaWorldObject
         ElunaUtil::WorldObjectInRangeCheck checker(true, obj, range, TYPEMASK_UNIT, entry, hostile, dead);
 
         Acore::CreatureLastSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, target, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         Eluna::Push(L, target);
         return 1;
@@ -260,7 +260,7 @@ namespace LuaWorldObject
         ElunaUtil::WorldObjectInRangeCheck checker(false, obj, range, TYPEMASK_PLAYER, 0, hostile, dead);
 
         Acore::PlayerListSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, list, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         lua_createtable(L, list.size(), 0);
         int tbl = lua_gettop(L);
@@ -297,7 +297,7 @@ namespace LuaWorldObject
         ElunaUtil::WorldObjectInRangeCheck checker(false, obj, range, TYPEMASK_UNIT, entry, hostile, dead);
 
         Acore::CreatureListSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, list, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         lua_createtable(L, list.size(), 0);
         int tbl = lua_gettop(L);
@@ -332,7 +332,7 @@ namespace LuaWorldObject
         ElunaUtil::WorldObjectInRangeCheck checker(false, obj, range, TYPEMASK_GAMEOBJECT, entry, hostile);
 
         Acore::GameObjectListSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, list, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         lua_createtable(L, list.size(), 0);
         int tbl = lua_gettop(L);
@@ -375,7 +375,7 @@ namespace LuaWorldObject
         WorldObject* target = NULL;
 
         Acore::WorldObjectLastSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, target, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         Eluna::Push(L, target);
         return 1;
@@ -408,7 +408,7 @@ namespace LuaWorldObject
         std::list<WorldObject*> list;
 
         Acore::WorldObjectListSearcher<ElunaUtil::WorldObjectInRangeCheck> searcher(obj, list, checker);
-        Cell::VisitAllObjects(obj, searcher, range);
+        Cell::VisitObjects(obj, searcher, range);
 
         lua_createtable(L, list.size(), 0);
         int tbl = lua_gettop(L);