diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5904ce5..86bde16 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ cmake_policy(SET CMP0015 NEW)
 
 set(GUI text.cpp)
 set(UTILS util.cpp)
-set(MATH quaternion.cpp vector.cpp matrix.cpp ray.cpp)
+set(MATH quaternion.cpp vector.cpp matrix.cpp rayCaster.cpp)
 set(RENDER lineRenderer.cpp particleEmitter.cpp camera.cpp light.cpp material.cpp mesh.cpp meshData.cpp model.cpp node.cpp quad.cpp box.cpp root.cpp shader.cpp texture.cpp)
 set(ANIM animationController.cpp animationChannel.cpp animation.cpp animatable.cpp keyframeChannel.cpp driver.cpp)
 set(ARMATURE skeleton.cpp bone.cpp ikSolver.cpp)
@@ -121,8 +121,8 @@ if(BUILD_SAMPLES)
 	add_executable(particleEmitterSample particleEmitterSample.cpp)
 	target_link_libraries(particleEmitterSample ${LIB_NAME})
 
-	add_executable(raySample raySample.cpp)
-	target_link_libraries(raySample ${LIB_NAME})
+	add_executable(rayCasterSample rayCasterSample.cpp)
+	target_link_libraries(rayCasterSample ${LIB_NAME})
 
 	add_executable(pbrSample pbrSample.cpp)
 	target_link_libraries(pbrSample ${LIB_NAME})
diff --git a/ray.cpp b/rayCaster.cpp
similarity index 99%
rename from ray.cpp
rename to rayCaster.cpp
index 6e98d4e..342dc1e 100644
--- a/ray.cpp
+++ b/rayCaster.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include "ray.h"
+#include "rayCaster.h"
 #include "mesh.h"
 #include "node.h"
 
diff --git a/ray.h b/rayCaster.h
similarity index 100%
rename from ray.h
rename to rayCaster.h
diff --git a/raySample.cpp b/rayCasterSample.cpp
similarity index 99%
rename from raySample.cpp
rename to rayCasterSample.cpp
index d8b5ae9..5439610 100644
--- a/raySample.cpp
+++ b/rayCasterSample.cpp
@@ -3,7 +3,7 @@
 #include "material.h"
 #include "assetManager.h"
 #include "lineRenderer.h"
-#include "ray.h"
+#include "rayCaster.h"
 
 using namespace std;
 using namespace vb01;