diff --git a/CMakeLists.txt b/CMakeLists.txt
index 412a5ad..bd21701 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 
 # Define Project
 project(
-	DataPath
+	datapath
 	VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}
 )
 set(PROJECT_FULL_NAME "DataPath IPC Library")
@@ -279,8 +279,12 @@ endif()
 
 # Includes
 target_include_directories(${PROJECT_NAME}
-	PRIVATE "source"
-	PUBLIC "include"
+	INTERFACE
+		"${PROJECT_SOURCE_DIR}/include"
+	PUBLIC
+		"${PROJECT_SOURCE_DIR}/include"
+	PRIVATE
+		"${PROJECT_SOURCE_DIR}/source"
 )
 
 # Defines
diff --git a/include/iserver.hpp b/include/iserver.hpp
index 3beca97..ae0d5ae 100644
--- a/include/iserver.hpp
+++ b/include/iserver.hpp
@@ -33,7 +33,7 @@ namespace datapath {
 		 * @param std::shared_ptr<datapath::isocket> Socket.
 		 * @return void
 		 */
-		datapath::event<bool&, std::shared_ptr<datapath::isocket>> _on_accept;
+		datapath::event<bool&, std::shared_ptr<datapath::isocket>> on_accept;
 
 		public:
 		virtual datapath::error close() = 0;
diff --git a/include/isocket.hpp b/include/isocket.hpp
index ef504c9..ad385ae 100644
--- a/include/isocket.hpp
+++ b/include/isocket.hpp
@@ -24,9 +24,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 namespace datapath {
 	class isocket {
 		public /*events*/:
-		datapath::event<const std::vector<char>&> _on_message;
+		datapath::event<const std::vector<char>&> on_message;
 
-		datapath::event<> _on_close;
+		datapath::event<> on_close;
 
 		public:
 		virtual bool good() = 0;
diff --git a/samples/benchmark/main.cpp b/samples/benchmark/main.cpp
index fe28f3f..62c0746 100644
--- a/samples/benchmark/main.cpp
+++ b/samples/benchmark/main.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <string>
 #include <thread>
 #include <vector>
-#include "datapath.hpp"
+#include <datapath.hpp>
 #include "measurer.hpp"
 
 static auto log_time = std::chrono::high_resolution_clock::now();