diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj
index 3eecd91f2201..d029cef82f2b 100644
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj
@@ -2629,10 +2629,10 @@
 		B677B0D61B18492D006762CB /* CCNavMeshObstacle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C51B18492D006762CB /* CCNavMeshObstacle.cpp */; };
 		B677B0D71B18492D006762CB /* CCNavMeshObstacle.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */; };
 		B677B0D81B18492D006762CB /* CCNavMeshObstacle.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */; };
-		B677B0D91B18492D006762CB /* CCNavMeshTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */; };
-		B677B0DA1B18492D006762CB /* CCNavMeshTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */; };
-		B677B0DB1B18492D006762CB /* CCNavMeshTool.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshTool.h */; };
-		B677B0DC1B18492D006762CB /* CCNavMeshTool.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshTool.h */; };
+		B677B0D91B18492D006762CB /* CCNavMeshUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */; };
+		B677B0DA1B18492D006762CB /* CCNavMeshUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */; };
+		B677B0DB1B18492D006762CB /* CCNavMeshUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshUtils.h */; };
+		B677B0DC1B18492D006762CB /* CCNavMeshUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshUtils.h */; };
 		B68778F81A8CA82E00643ABF /* CCParticle3DAffector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B68778F01A8CA82E00643ABF /* CCParticle3DAffector.cpp */; };
 		B68778F91A8CA82E00643ABF /* CCParticle3DAffector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B68778F01A8CA82E00643ABF /* CCParticle3DAffector.cpp */; };
 		B68778FA1A8CA82E00643ABF /* CCParticle3DAffector.h in Headers */ = {isa = PBXBuildFile; fileRef = B68778F11A8CA82E00643ABF /* CCParticle3DAffector.h */; };
@@ -5008,8 +5008,8 @@
 		B677B0C41B18492D006762CB /* CCNavMeshDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshDebugDraw.h; path = ../cocos/navmesh/CCNavMeshDebugDraw.h; sourceTree = "<group>"; };
 		B677B0C51B18492D006762CB /* CCNavMeshObstacle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNavMeshObstacle.cpp; path = ../cocos/navmesh/CCNavMeshObstacle.cpp; sourceTree = "<group>"; };
 		B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshObstacle.h; path = ../cocos/navmesh/CCNavMeshObstacle.h; sourceTree = "<group>"; };
-		B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNavMeshTool.cpp; path = ../cocos/navmesh/CCNavMeshTool.cpp; sourceTree = "<group>"; };
-		B677B0C81B18492D006762CB /* CCNavMeshTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshTool.h; path = ../cocos/navmesh/CCNavMeshTool.h; sourceTree = "<group>"; };
+		B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNavMeshUtils.cpp; path = ../cocos/navmesh/CCNavMeshUtils.cpp; sourceTree = "<group>"; };
+		B677B0C81B18492D006762CB /* CCNavMeshUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNavMeshUtils.h; path = ../cocos/navmesh/CCNavMeshUtils.h; sourceTree = "<group>"; };
 		B67C624319D4186F00F11FC6 /* ccShader_3D_ColorNormal.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorNormal.frag; sourceTree = "<group>"; };
 		B67C624419D4186F00F11FC6 /* ccShader_3D_ColorNormalTex.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorNormalTex.frag; sourceTree = "<group>"; };
 		B67C624519D4186F00F11FC6 /* ccShader_3D_PositionNormalTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionNormalTex.vert; sourceTree = "<group>"; };
@@ -8685,8 +8685,8 @@
 				B677B0C41B18492D006762CB /* CCNavMeshDebugDraw.h */,
 				B677B0C51B18492D006762CB /* CCNavMeshObstacle.cpp */,
 				B677B0C61B18492D006762CB /* CCNavMeshObstacle.h */,
-				B677B0C71B18492D006762CB /* CCNavMeshTool.cpp */,
-				B677B0C81B18492D006762CB /* CCNavMeshTool.h */,
+				B677B0C71B18492D006762CB /* CCNavMeshUtils.cpp */,
+				B677B0C81B18492D006762CB /* CCNavMeshUtils.h */,
 			);
 			name = navmesh;
 			sourceTree = "<group>";
@@ -8973,7 +8973,7 @@
 				1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
 				B6DD2FDB1B04825B00E47F5F /* DetourLocalBoundary.h in Headers */,
 				B6CAB3491AF9AA1A00B9B856 /* gim_clip_polygon.h in Headers */,
-				B677B0DB1B18492D006762CB /* CCNavMeshTool.h in Headers */,
+				B677B0DB1B18492D006762CB /* CCNavMeshUtils.h in Headers */,
 				B6CAAFE41AF9A9E100B9B856 /* CCPhysics3D.h in Headers */,
 				15AE1A7F19AAD40300C27E9E /* b2DistanceJoint.h in Headers */,
 				B665E3301AA80A6500DDB1C5 /* CCPUOnCountObserverTranslator.h in Headers */,
@@ -9999,7 +9999,7 @@
 				B6CAB5341AF9AA1A00B9B856 /* btTransformUtil.h in Headers */,
 				1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */,
 				15AE1B9319AADA9A00C27E9E /* UIHelper.h in Headers */,
-				B677B0DC1B18492D006762CB /* CCNavMeshTool.h in Headers */,
+				B677B0DC1B18492D006762CB /* CCNavMeshUtils.h in Headers */,
 				50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
 				B665E2111AA80A6500DDB1C5 /* CCPUBaseForceAffector.h in Headers */,
 				B665E30D1AA80A6500DDB1C5 /* CCPUNoise.h in Headers */,
@@ -10890,7 +10890,7 @@
 				B6CAB41F1AF9AA1A00B9B856 /* btMLCPSolver.cpp in Sources */,
 				46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */,
 				B665E40A1AA80A6600DDB1C5 /* CCPUSphereSurfaceEmitterTranslator.cpp in Sources */,
-				B677B0D91B18492D006762CB /* CCNavMeshTool.cpp in Sources */,
+				B677B0D91B18492D006762CB /* CCNavMeshUtils.cpp in Sources */,
 				50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */,
 				B665E35E1AA80A6500DDB1C5 /* CCPUOnRandomObserverTranslator.cpp in Sources */,
 				B6CAB2931AF9AA1A00B9B856 /* btCompoundShape.cpp in Sources */,
@@ -12433,7 +12433,7 @@
 				D0FD034C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp in Sources */,
 				B665E31F1AA80A6500DDB1C5 /* CCPUOnClearObserverTranslator.cpp in Sources */,
 				B665E4331AA80A6600DDB1C5 /* CCPUVertexEmitter.cpp in Sources */,
-				B677B0DA1B18492D006762CB /* CCNavMeshTool.cpp in Sources */,
+				B677B0DA1B18492D006762CB /* CCNavMeshUtils.cpp in Sources */,
 				B665E3C71AA80A6600DDB1C5 /* CCPUScaleVelocityAffector.cpp in Sources */,
 				B6CAB26E1AF9AA1A00B9B856 /* btSphereSphereCollisionAlgorithm.cpp in Sources */,
 				50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */,
diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj
index 1c0952912dc1..275310dd895d 100644
--- a/cocos/2d/libcocos2d.vcxproj
+++ b/cocos/2d/libcocos2d.vcxproj
@@ -568,7 +568,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
     <ClCompile Include="..\navmesh\CCNavMeshAgent.cpp" />
     <ClCompile Include="..\navmesh\CCNavMeshDebugDraw.cpp" />
     <ClCompile Include="..\navmesh\CCNavMeshObstacle.cpp" />
-    <ClCompile Include="..\navmesh\CCNavMeshTool.cpp" />
+    <ClCompile Include="..\navmesh\CCNavMeshUtils.cpp" />
     <ClCompile Include="..\network\HttpClient.cpp" />
     <ClCompile Include="..\network\SocketIO.cpp" />
     <ClCompile Include="..\network\WebSocket.cpp" />
@@ -1162,7 +1162,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
     <ClInclude Include="..\navmesh\CCNavMeshAgent.h" />
     <ClInclude Include="..\navmesh\CCNavMeshDebugDraw.h" />
     <ClInclude Include="..\navmesh\CCNavMeshObstacle.h" />
-    <ClInclude Include="..\navmesh\CCNavMeshTool.h" />
+    <ClInclude Include="..\navmesh\CCNavMeshUtils.h" />
     <ClInclude Include="..\network\HttpClient.h" />
     <ClInclude Include="..\network\HttpRequest.h" />
     <ClInclude Include="..\network\HttpResponse.h" />
diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters
index 2dc1f4a7afa1..397222cdef76 100644
--- a/cocos/2d/libcocos2d.vcxproj.filters
+++ b/cocos/2d/libcocos2d.vcxproj.filters
@@ -1887,7 +1887,7 @@
     <ClCompile Include="..\navmesh\CCNavMeshObstacle.cpp">
       <Filter>navmesh</Filter>
     </ClCompile>
-    <ClCompile Include="..\navmesh\CCNavMeshTool.cpp">
+    <ClCompile Include="..\navmesh\CCNavMeshUtils.cpp">
       <Filter>navmesh</Filter>
     </ClCompile>
     <ClCompile Include="..\base\CCNinePatchImageParser.cpp">
@@ -3699,7 +3699,7 @@
     <ClInclude Include="..\navmesh\CCNavMeshObstacle.h">
       <Filter>navmesh</Filter>
     </ClInclude>
-    <ClInclude Include="..\navmesh\CCNavMeshTool.h">
+    <ClInclude Include="..\navmesh\CCNavMeshUtils.h">
       <Filter>navmesh</Filter>
     </ClInclude>
     <ClInclude Include="..\base\CCNinePatchImageParser.h">
diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
index 0a35ca8a8e9f..341529c72e90 100644
--- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
+++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
@@ -445,7 +445,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpClient.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpRequest.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpResponse.h" />
@@ -1043,7 +1043,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpClient.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\SocketIO.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\WebSocket.cpp" />
diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
index 7ff23fcaa95b..fcda1bb61e0d 100644
--- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
+++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
@@ -1800,7 +1800,7 @@
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h">
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h">
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioEngine-winrt.h" />
@@ -3437,7 +3437,7 @@
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp">
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshTool.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp">
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\AudioEngine.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.cpp" />
diff --git a/cocos/Android.mk b/cocos/Android.mk
index 43a4d563fe52..bf6f09dc92e9 100644
--- a/cocos/Android.mk
+++ b/cocos/Android.mk
@@ -208,7 +208,7 @@ navmesh/CCNavMesh.cpp \
 navmesh/CCNavMeshAgent.cpp \
 navmesh/CCNavMeshDebugDraw.cpp \
 navmesh/CCNavMeshObstacle.cpp \
-navmesh/CCNavMeshTool.cpp \
+navmesh/CCNavMeshUtils.cpp \
 ../external/ConvertUTF/ConvertUTFWrapper.cpp \
 ../external/ConvertUTF/ConvertUTF.c \
 ../external/tinyxml2/tinyxml2.cpp \
diff --git a/cocos/navmesh/CCNavMesh.h b/cocos/navmesh/CCNavMesh.h
index 242210af6eaa..1c9f81de0fc1 100644
--- a/cocos/navmesh/CCNavMesh.h
+++ b/cocos/navmesh/CCNavMesh.h
@@ -40,7 +40,7 @@
 #include "navmesh/CCNavMeshAgent.h"
 #include "navmesh/CCNavMeshDebugDraw.h"
 #include "navmesh/CCNavMeshObstacle.h"
-#include "navmesh/CCNavMeshTool.h"
+#include "navmesh/CCNavMeshUtils.h"
 
 
 NS_CC_BEGIN
diff --git a/cocos/navmesh/CCNavMeshTool.cpp b/cocos/navmesh/CCNavMeshUtils.cpp
similarity index 99%
rename from cocos/navmesh/CCNavMeshTool.cpp
rename to cocos/navmesh/CCNavMeshUtils.cpp
index 200cc75f8fa0..1831e5d062b4 100644
--- a/cocos/navmesh/CCNavMeshTool.cpp
+++ b/cocos/navmesh/CCNavMeshUtils.cpp
@@ -21,7 +21,7 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
-#include "navmesh/CCNavMeshTool.h"
+#include "navmesh/CCNavMeshUtils.h"
 #if CC_USE_NAVMESH
 
 #include "recast/Detour/DetourCommon.h"
diff --git a/cocos/navmesh/CCNavMeshTool.h b/cocos/navmesh/CCNavMeshUtils.h
similarity index 100%
rename from cocos/navmesh/CCNavMeshTool.h
rename to cocos/navmesh/CCNavMeshUtils.h
diff --git a/cocos/navmesh/CMakeLists.txt b/cocos/navmesh/CMakeLists.txt
index 7a4249e14bdc..142008e13772 100644
--- a/cocos/navmesh/CMakeLists.txt
+++ b/cocos/navmesh/CMakeLists.txt
@@ -5,5 +5,5 @@ set(COCOS_NAVMESH_SRC
   navmesh/CCNavMeshAgent.cpp
   navmesh/CCNavMeshDebugDraw.cpp
   navmesh/CCNavMeshObstacle.cpp
-  navmesh/CCNavMeshTool.cpp
+  navmesh/CCNavMeshUtils.cpp
 )