diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55cf9d6..03b3a0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.10)
 project(Traceroute VERSION 1.1.200119)
 
 # PROPERTIES
+set(EXE_NAME traceroute)
+
 set(INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include")
 set(SRC_DIR "${PROJECT_SOURCE_DIR}/src")
 set(EXE_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/bin")
@@ -11,7 +13,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unknown-pragmas -O2")
 
 # SOURCES
-include_directories("${INCLUDE_DIR}")
+include_directories(${INCLUDE_DIR})
 
 # OUTPUT
-add_subdirectory("${SRC_DIR}")
+add_subdirectory(${SRC_DIR})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 56d85a1..a960662 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.10)
 
 # SOURCES
 set(SOURCES
-    IPAddress.cpp
-    ICMPController.cpp
-    SocketReceiver.cpp
-    SocketSender.cpp
-    traceroute.cpp)
+    "IPAddress.cpp"
+    "ICMPController.cpp"
+    "SocketReceiver.cpp"
+    "SocketSender.cpp"
+    "traceroute.cpp")
 
 # OUTPUT
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${EXE_OUTPUT_DIR}")
-add_executable(traceroute ${SOURCES})
+add_executable(${EXE_NAME} ${SOURCES})