diff --git a/lib/decoding/control_channels_decoder_impl.cc b/lib/decoding/control_channels_decoder_impl.cc
index f67abca..3ea3fd9 100644
--- a/lib/decoding/control_channels_decoder_impl.cc
+++ b/lib/decoding/control_channels_decoder_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/gsmtap.h>
 #include "control_channels_decoder_impl.h"
 
 #define DATA_BYTES 23
diff --git a/lib/decoding/control_channels_decoder_impl.h b/lib/decoding/control_channels_decoder_impl.h
index 93d4950..2fa3dce 100644
--- a/lib/decoding/control_channels_decoder_impl.h
+++ b/lib/decoding/control_channels_decoder_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
 #define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
 
-#include <gsm/decoding/control_channels_decoder.h>
+#include <grgsm/decoding/control_channels_decoder.h>
 #include "fire_crc.h"
 #include "cch.h"
 
diff --git a/lib/demapping/get_bcch_or_ccch_bursts_impl.cc b/lib/demapping/get_bcch_or_ccch_bursts_impl.cc
index 875360e..5817627 100644
--- a/lib/demapping/get_bcch_or_ccch_bursts_impl.cc
+++ b/lib/demapping/get_bcch_or_ccch_bursts_impl.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <gsm/endian.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/endian.h>
+#include <grgsm/gsmtap.h>
 #include "get_bcch_or_ccch_bursts_impl.h"
 
 namespace gr {
diff --git a/lib/demapping/get_bcch_or_ccch_bursts_impl.h b/lib/demapping/get_bcch_or_ccch_bursts_impl.h
index 1ba5e7b..ebf63e3 100644
--- a/lib/demapping/get_bcch_or_ccch_bursts_impl.h
+++ b/lib/demapping/get_bcch_or_ccch_bursts_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
 #define INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
 
-#include <gsm/demapping/get_bcch_or_ccch_bursts.h>
+#include <grgsm/demapping/get_bcch_or_ccch_bursts.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.cc b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
index 325a59b..c563f7d 100644
--- a/lib/demapping/universal_ctrl_chans_demapper_impl.cc
+++ b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
@@ -26,8 +26,8 @@
 
 #include <gnuradio/io_signature.h>
 #include "universal_ctrl_chans_demapper_impl.h"
-#include <gsm/endian.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/endian.h>
+#include <grgsm/gsmtap.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.h b/lib/demapping/universal_ctrl_chans_demapper_impl.h
index 1b40d74..60cdc5d 100644
--- a/lib/demapping/universal_ctrl_chans_demapper_impl.h
+++ b/lib/demapping/universal_ctrl_chans_demapper_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_IMPL_H
 #define INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_IMPL_H
 
-#include <gsm/demapping/universal_ctrl_chans_demapper.h>
+#include <grgsm/demapping/universal_ctrl_chans_demapper.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc
index f888a93..8803a84 100644
--- a/lib/misc_utils/bursts_printer_impl.cc
+++ b/lib/misc_utils/bursts_printer_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/gsmtap.h>
 #include <iterator>
 #include <algorithm>
 #include "bursts_printer_impl.h"
diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h
index 67f3c25..0ee6923 100644
--- a/lib/misc_utils/bursts_printer_impl.h
+++ b/lib/misc_utils/bursts_printer_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 #define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 
-#include <gsm/misc_utils/bursts_printer.h>
+#include <grgsm/misc_utils/bursts_printer.h>
 #include <set>
 
 namespace gr {
diff --git a/lib/misc_utils/controlled_const_source_f_impl.h b/lib/misc_utils/controlled_const_source_f_impl.h
index 8fa2f8d..36a6258 100644
--- a/lib/misc_utils/controlled_const_source_f_impl.h
+++ b/lib/misc_utils/controlled_const_source_f_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 
-#include <gsm/misc_utils/controlled_const_source_f.h>
+#include <grgsm/misc_utils/controlled_const_source_f.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/controlled_rotator_cc_impl.h b/lib/misc_utils/controlled_rotator_cc_impl.h
index f9a0de7..14064cb 100644
--- a/lib/misc_utils/controlled_rotator_cc_impl.h
+++ b/lib/misc_utils/controlled_rotator_cc_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 
-#include <gsm/misc_utils/controlled_rotator_cc.h>
+#include <grgsm/misc_utils/controlled_rotator_cc.h>
 #include <gnuradio/blocks/rotator.h>
 
 namespace gr {
diff --git a/lib/misc_utils/extract_system_info_impl.cc b/lib/misc_utils/extract_system_info_impl.cc
index c4cfa1e..a7ed06d 100644
--- a/lib/misc_utils/extract_system_info_impl.cc
+++ b/lib/misc_utils/extract_system_info_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/gsmtap.h>
 #include <unistd.h>
 #include <set>
 #include <iterator>
diff --git a/lib/misc_utils/extract_system_info_impl.h b/lib/misc_utils/extract_system_info_impl.h
index 75d41b3..119303d 100644
--- a/lib/misc_utils/extract_system_info_impl.h
+++ b/lib/misc_utils/extract_system_info_impl.h
@@ -23,8 +23,7 @@
 #ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 #define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 
-#include <gsm/misc_utils/extract_system_info.h>
-
+#include <grgsm/misc_utils/extract_system_info.h>
 
 
 namespace gr {
diff --git a/lib/misc_utils/message_printer_impl.cc b/lib/misc_utils/message_printer_impl.cc
index 11142aa..48cd95b 100644
--- a/lib/misc_utils/message_printer_impl.cc
+++ b/lib/misc_utils/message_printer_impl.cc
@@ -27,7 +27,7 @@
 #include <gnuradio/io_signature.h>
 #include <stdio.h>
 #include "message_printer_impl.h"
-#include "gsm/gsmtap.h"
+#include "grgsm/gsmtap.h"
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/message_printer_impl.h b/lib/misc_utils/message_printer_impl.h
index 897890e..e2c8236 100644
--- a/lib/misc_utils/message_printer_impl.h
+++ b/lib/misc_utils/message_printer_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 #define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 
-#include <gsm/misc_utils/message_printer.h>
+#include <grgsm/misc_utils/message_printer.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/receiver/receiver_impl.cc b/lib/receiver/receiver_impl.cc
index 378910d..4d833ae 100644
--- a/lib/receiver/receiver_impl.cc
+++ b/lib/receiver/receiver_impl.cc
@@ -25,9 +25,6 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include "receiver_impl.h"
-
-#include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <math.h>
 #include <boost/circular_buffer.hpp>
@@ -35,11 +32,13 @@
 #include <numeric>
 #include <viterbi_detector.h>
 #include <string.h>
-#include <sch.h>
 #include <iostream>
 #include <iomanip>
 #include <boost/scoped_ptr.hpp>
-#include <gsm/endian.h>
+
+#include <sch.h>
+#include "receiver_impl.h"
+#include <grgsm/endian.h>
 
 //files included for debuging
 //#include "plotting/plotting.hpp"
diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h
index a6edbce..6dfeaf6 100644
--- a/lib/receiver/receiver_impl.h
+++ b/lib/receiver/receiver_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GSM_RECEIVER_IMPL_H
 #define INCLUDED_GSM_RECEIVER_IMPL_H
 
-#include <gsm/receiver/receiver.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/receiver/receiver.h>
+#include <grgsm/gsmtap.h>
 #include <gsm_constants.h>
 #include <receiver_config.h>
 
diff --git a/lib/receiver/sch.h b/lib/receiver/sch.h
index 11a6d06..21976a4 100644
--- a/lib/receiver/sch.h
+++ b/lib/receiver/sch.h
@@ -2,7 +2,7 @@
 #ifndef __SCH_H__
 #define __SCH_H__ 1
 
-#include <gsm/api.h>
+#include <grgsm/api.h>
 
 #ifdef __cplusplus
 extern "C"