diff --git a/include/grgsm/api.h b/include/grgsm/api.h
index 5ef6053..d36befb 100644
--- a/include/grgsm/api.h
+++ b/include/grgsm/api.h
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GSM_API_H
-#define INCLUDED_GSM_API_H
+#ifndef INCLUDED_GRGSM_API_H
+#define INCLUDED_GRGSM_API_H
 
 #include <gnuradio/attributes.h>
 
 #ifdef gnuradio_gsm_EXPORTS
-#  define GSM_API __GR_ATTR_EXPORT
+#  define GRGSM_API __GR_ATTR_EXPORT
 #else
-#  define GSM_API __GR_ATTR_IMPORT
+#  define GRGSM_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_GSM_API_H */
+#endif /* INCLUDED_GRGSM_API_H */
diff --git a/include/grgsm/decoding/control_channels_decoder.h b/include/grgsm/decoding/control_channels_decoder.h
index a3a8d8c..066eaa0 100644
--- a/include/grgsm/decoding/control_channels_decoder.h
+++ b/include/grgsm/decoding/control_channels_decoder.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API control_channels_decoder : virtual public gr::block
+    class GRGSM_API control_channels_decoder : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<control_channels_decoder> sptr;
diff --git a/include/grgsm/decoding/tch_f_decoder.h b/include/grgsm/decoding/tch_f_decoder.h
index 8dbf68b..18a1baa 100644
--- a/include/grgsm/decoding/tch_f_decoder.h
+++ b/include/grgsm/decoding/tch_f_decoder.h
@@ -49,7 +49,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API tch_f_decoder : virtual public gr::block
+    class GRGSM_API tch_f_decoder : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<tch_f_decoder> sptr;
diff --git a/include/grgsm/decryption/decryption.h b/include/grgsm/decryption/decryption.h
index 51328b1..b3a66e1 100644
--- a/include/grgsm/decryption/decryption.h
+++ b/include/grgsm/decryption/decryption.h
@@ -37,7 +37,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API decryption : virtual public gr::block
+    class GRGSM_API decryption : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<decryption> sptr;
diff --git a/include/grgsm/demapping/tch_f_chans_demapper.h b/include/grgsm/demapping/tch_f_chans_demapper.h
index affd723..cdd7457 100644
--- a/include/grgsm/demapping/tch_f_chans_demapper.h
+++ b/include/grgsm/demapping/tch_f_chans_demapper.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API tch_f_chans_demapper : virtual public gr::block
+    class GRGSM_API tch_f_chans_demapper : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<tch_f_chans_demapper> sptr;
diff --git a/include/grgsm/demapping/universal_ctrl_chans_demapper.h b/include/grgsm/demapping/universal_ctrl_chans_demapper.h
index eea2bde..34bcafd 100644
--- a/include/grgsm/demapping/universal_ctrl_chans_demapper.h
+++ b/include/grgsm/demapping/universal_ctrl_chans_demapper.h
@@ -36,7 +36,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API universal_ctrl_chans_demapper : virtual public gr::block
+    class GRGSM_API universal_ctrl_chans_demapper : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<universal_ctrl_chans_demapper> sptr;
diff --git a/include/grgsm/flow_control/burst_fnr_filter.h b/include/grgsm/flow_control/burst_fnr_filter.h
index 9451d58..919bc1c 100644
--- a/include/grgsm/flow_control/burst_fnr_filter.h
+++ b/include/grgsm/flow_control/burst_fnr_filter.h
@@ -41,7 +41,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_fnr_filter : virtual public gr::block
+    class GRGSM_API burst_fnr_filter : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_fnr_filter> sptr;
diff --git a/include/grgsm/flow_control/burst_sdcch_subslot_filter.h b/include/grgsm/flow_control/burst_sdcch_subslot_filter.h
index 9c89df3..150d76a 100644
--- a/include/grgsm/flow_control/burst_sdcch_subslot_filter.h
+++ b/include/grgsm/flow_control/burst_sdcch_subslot_filter.h
@@ -40,7 +40,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_sdcch_subslot_filter : virtual public gr::block
+    class GRGSM_API burst_sdcch_subslot_filter : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_sdcch_subslot_filter> sptr;
diff --git a/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h b/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h
index aee2a24..2b48c43 100644
--- a/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h
+++ b/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h
@@ -40,7 +40,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_sdcch_subslot_splitter : virtual public gr::block
+    class GRGSM_API burst_sdcch_subslot_splitter : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_sdcch_subslot_splitter> sptr;
diff --git a/include/grgsm/flow_control/burst_timeslot_filter.h b/include/grgsm/flow_control/burst_timeslot_filter.h
index 00ee2c3..f23fcf7 100644
--- a/include/grgsm/flow_control/burst_timeslot_filter.h
+++ b/include/grgsm/flow_control/burst_timeslot_filter.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_timeslot_filter : virtual public gr::block
+    class GRGSM_API burst_timeslot_filter : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_timeslot_filter> sptr;
diff --git a/include/grgsm/flow_control/burst_timeslot_splitter.h b/include/grgsm/flow_control/burst_timeslot_splitter.h
index ee6298e..4daac08 100644
--- a/include/grgsm/flow_control/burst_timeslot_splitter.h
+++ b/include/grgsm/flow_control/burst_timeslot_splitter.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_timeslot_splitter : virtual public gr::block
+    class GRGSM_API burst_timeslot_splitter : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_timeslot_splitter> sptr;
diff --git a/include/grgsm/flow_control/dummy_burst_filter.h b/include/grgsm/flow_control/dummy_burst_filter.h
index 0922433..b969611 100644
--- a/include/grgsm/flow_control/dummy_burst_filter.h
+++ b/include/grgsm/flow_control/dummy_burst_filter.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API dummy_burst_filter : virtual public gr::block
+    class GRGSM_API dummy_burst_filter : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<dummy_burst_filter> sptr;
diff --git a/include/grgsm/misc_utils/burst_file_sink.h b/include/grgsm/misc_utils/burst_file_sink.h
index 7263baa..3a567e9 100644
--- a/include/grgsm/misc_utils/burst_file_sink.h
+++ b/include/grgsm/misc_utils/burst_file_sink.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_file_sink : virtual public gr::block
+    class GRGSM_API burst_file_sink : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_file_sink> sptr;
diff --git a/include/grgsm/misc_utils/burst_file_source.h b/include/grgsm/misc_utils/burst_file_source.h
index e18ef44..b401848 100644
--- a/include/grgsm/misc_utils/burst_file_source.h
+++ b/include/grgsm/misc_utils/burst_file_source.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_file_source : virtual public gr::block
+    class GRGSM_API burst_file_source : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_file_source> sptr;
diff --git a/include/grgsm/misc_utils/bursts_printer.h b/include/grgsm/misc_utils/bursts_printer.h
index eb006c5..36e30b8 100644
--- a/include/grgsm/misc_utils/bursts_printer.h
+++ b/include/grgsm/misc_utils/bursts_printer.h
@@ -37,7 +37,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API bursts_printer : virtual public gr::block
+    class GRGSM_API bursts_printer : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<bursts_printer> sptr;
diff --git a/include/grgsm/misc_utils/controlled_const_source_f.h b/include/grgsm/misc_utils/controlled_const_source_f.h
index afd9d81..235c731 100644
--- a/include/grgsm/misc_utils/controlled_const_source_f.h
+++ b/include/grgsm/misc_utils/controlled_const_source_f.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API controlled_const_source_f : virtual public gr::sync_block
+    class GRGSM_API controlled_const_source_f : virtual public gr::sync_block
     {
      public:
       typedef boost::shared_ptr<controlled_const_source_f> sptr;
diff --git a/include/grgsm/misc_utils/controlled_rotator_cc.h b/include/grgsm/misc_utils/controlled_rotator_cc.h
index bd9c04f..8b0ad8d 100644
--- a/include/grgsm/misc_utils/controlled_rotator_cc.h
+++ b/include/grgsm/misc_utils/controlled_rotator_cc.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API controlled_rotator_cc : virtual public sync_block
+    class GRGSM_API controlled_rotator_cc : virtual public sync_block
     {
      public:
       typedef boost::shared_ptr<controlled_rotator_cc> sptr;
diff --git a/include/grgsm/misc_utils/extract_immediate_assignment.h b/include/grgsm/misc_utils/extract_immediate_assignment.h
index ac8a630..f848cd2 100644
--- a/include/grgsm/misc_utils/extract_immediate_assignment.h
+++ b/include/grgsm/misc_utils/extract_immediate_assignment.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API extract_immediate_assignment : virtual public gr::block
+    class GRGSM_API extract_immediate_assignment : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<extract_immediate_assignment> sptr;
diff --git a/include/grgsm/misc_utils/extract_system_info.h b/include/grgsm/misc_utils/extract_system_info.h
index a05be18..32331b4 100644
--- a/include/grgsm/misc_utils/extract_system_info.h
+++ b/include/grgsm/misc_utils/extract_system_info.h
@@ -36,7 +36,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API extract_system_info : virtual public gr::block
+    class GRGSM_API extract_system_info : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<extract_system_info> sptr;
diff --git a/include/grgsm/misc_utils/message_file_sink.h b/include/grgsm/misc_utils/message_file_sink.h
index 61a9c53..16c6253 100644
--- a/include/grgsm/misc_utils/message_file_sink.h
+++ b/include/grgsm/misc_utils/message_file_sink.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API message_file_sink : virtual public gr::block
+    class GRGSM_API message_file_sink : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<message_file_sink> sptr;
diff --git a/include/grgsm/misc_utils/message_file_source.h b/include/grgsm/misc_utils/message_file_source.h
index 51d2525..2ad61f9 100644
--- a/include/grgsm/misc_utils/message_file_source.h
+++ b/include/grgsm/misc_utils/message_file_source.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API message_file_source : virtual public gr::block
+    class GRGSM_API message_file_source : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<message_file_source> sptr;
diff --git a/include/grgsm/misc_utils/message_printer.h b/include/grgsm/misc_utils/message_printer.h
index 04aae94..6755b76 100644
--- a/include/grgsm/misc_utils/message_printer.h
+++ b/include/grgsm/misc_utils/message_printer.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API message_printer : virtual public gr::block
+    class GRGSM_API message_printer : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<message_printer> sptr;
diff --git a/include/grgsm/misc_utils/tmsi_dumper.h b/include/grgsm/misc_utils/tmsi_dumper.h
index 88e9941..8ea19a4 100644
--- a/include/grgsm/misc_utils/tmsi_dumper.h
+++ b/include/grgsm/misc_utils/tmsi_dumper.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API tmsi_dumper : virtual public gr::block
+    class GRGSM_API tmsi_dumper : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<tmsi_dumper> sptr;
diff --git a/include/grgsm/qa_utils/burst_sink.h b/include/grgsm/qa_utils/burst_sink.h
index 266cbc8..0d1330c 100644
--- a/include/grgsm/qa_utils/burst_sink.h
+++ b/include/grgsm/qa_utils/burst_sink.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_sink : virtual public gr::block
+    class GRGSM_API burst_sink : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_sink> sptr;
diff --git a/include/grgsm/qa_utils/burst_source.h b/include/grgsm/qa_utils/burst_source.h
index bfed70f..67c881c 100644
--- a/include/grgsm/qa_utils/burst_source.h
+++ b/include/grgsm/qa_utils/burst_source.h
@@ -34,7 +34,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API burst_source : virtual public gr::block
+    class GRGSM_API burst_source : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<burst_source> sptr;
diff --git a/include/grgsm/qa_utils/message_sink.h b/include/grgsm/qa_utils/message_sink.h
index 5cfe2f7..14369b0 100644
--- a/include/grgsm/qa_utils/message_sink.h
+++ b/include/grgsm/qa_utils/message_sink.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API message_sink : virtual public gr::block
+    class GRGSM_API message_sink : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<message_sink> sptr;
diff --git a/include/grgsm/qa_utils/message_source.h b/include/grgsm/qa_utils/message_source.h
index 5c3e8a1..dc1f546 100644
--- a/include/grgsm/qa_utils/message_source.h
+++ b/include/grgsm/qa_utils/message_source.h
@@ -35,7 +35,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API message_source : virtual public gr::block
+    class GRGSM_API message_source : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<message_source> sptr;
diff --git a/include/grgsm/receiver/clock_offset_control.h b/include/grgsm/receiver/clock_offset_control.h
index 981c0dc..9a96d9c 100644
--- a/include/grgsm/receiver/clock_offset_control.h
+++ b/include/grgsm/receiver/clock_offset_control.h
@@ -36,7 +36,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API clock_offset_control : virtual public gr::block
+    class GRGSM_API clock_offset_control : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<clock_offset_control> sptr;
diff --git a/include/grgsm/receiver/cx_channel_hopper.h b/include/grgsm/receiver/cx_channel_hopper.h
index c8c2787..99a65c7 100644
--- a/include/grgsm/receiver/cx_channel_hopper.h
+++ b/include/grgsm/receiver/cx_channel_hopper.h
@@ -36,7 +36,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API cx_channel_hopper : virtual public gr::block
+    class GRGSM_API cx_channel_hopper : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<cx_channel_hopper> sptr;
diff --git a/include/grgsm/receiver/receiver.h b/include/grgsm/receiver/receiver.h
index 25509d2..97297ca 100644
--- a/include/grgsm/receiver/receiver.h
+++ b/include/grgsm/receiver/receiver.h
@@ -38,7 +38,7 @@
      * \ingroup gsm
      *
      */
-    class GSM_API receiver : virtual public sync_block
+    class GRGSM_API receiver : virtual public sync_block
     {
      public:
       typedef boost::shared_ptr<receiver> sptr;
diff --git a/lib/receiver/sch.h b/lib/receiver/sch.h
index 21976a4..7b5a657 100644
--- a/lib/receiver/sch.h
+++ b/lib/receiver/sch.h
@@ -9,7 +9,7 @@
 {
 #endif
 
-  GSM_API int decode_sch(const unsigned char *buf, int * t1_o, int * t2_o, int * t3_o, int * ncc, int * bcc);
+  GRGSM_API int decode_sch(const unsigned char *buf, int * t1_o, int * t2_o, int * t3_o, int * ncc, int * bcc);
 
 #ifdef __cplusplus
 }
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index 51556ed..dc2718e 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 
-#define GSM_API
+#define GRGSM_API
 
 %include "gnuradio.i"			// the common stuff