diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6abc58..e0dff42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@
 find_package(Boost "1.35" COMPONENTS filesystem system)
 
 if(NOT Boost_FOUND)
-    message(FATAL_ERROR "Boost required to compile gsm")
+    message(FATAL_ERROR "Boost required to compile gr-gsm")
 endif()
 
 ########################################################################
@@ -71,7 +71,7 @@
 set(GR_RUNTIME_DIR      bin)
 set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
 set(GR_INCLUDE_DIR      include/grgsm)
-set(GR_INCLUDE_DIR      include/ggrsm/misc_utils)
+set(GR_INCLUDE_DIR      include/grgsm/misc_utils)
 set(GR_INCLUDE_DIR      include/grgsm/receiver)
 set(GR_INCLUDE_DIR      include/grgsm/demapping)
 set(GR_INCLUDE_DIR      include/grgsm/decoding)
@@ -95,13 +95,13 @@
 find_package(Doxygen)
 
 if(NOT GNURADIO_RUNTIME_FOUND)
-    message(FATAL_ERROR "GnuRadio Runtime required to compile gsm")
+    message(FATAL_ERROR "GnuRadio Runtime required to compile gr-gsm")
 endif()
 if(NOT VOLK_FOUND)
-    message(FATAL_ERROR "Volk library required to compile gsm")
+    message(FATAL_ERROR "Volk library required to compile gr-gsm")
 endif()
 if(NOT CPPUNIT_FOUND)
-    message(FATAL_ERROR "CppUnit required to compile gsm")
+    message(FATAL_ERROR "CppUnit required to compile gr-gsm")
 endif()
 
 ########################################################################
@@ -151,7 +151,7 @@
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include)
+add_subdirectory(include/grgsm)
 add_subdirectory(lib)
 add_subdirectory(swig)
 add_subdirectory(python)
@@ -162,6 +162,6 @@
 ########################################################################
 # Install cmake search helper for this library
 ########################################################################
-install(FILES cmake/Modules/gsmConfig.cmake        
+install(FILES cmake/Modules/gr-gsmConfig.cmake        
     DESTINATION lib${LIB_SUFFIX}/cmake/grgsm
 )