diff --git a/python/qa_burst_fnr_filter.py b/python/qa_burst_fnr_filter.py
index a1d3d11..cdd3ff4 100755
--- a/python/qa_burst_fnr_filter.py
+++ b/python/qa_burst_fnr_filter.py
@@ -88,8 +88,8 @@ class qa_burst_fnr_filter (gr_unittest.TestCase):
 
         fnr_filter = grgsm.burst_fnr_filter(grgsm.FILTER_LESS_OR_EQUAL, 1500123)
         
-        src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input)
-        sink = grgsm.burst_sink_qa()
+        src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input)
+        sink = grgsm.burst_sink()
 
         self.tb.msg_connect(src, "out", fnr_filter, "in")
         self.tb.msg_connect(fnr_filter, "out", sink, "in")
@@ -152,8 +152,8 @@ class qa_burst_fnr_filter (gr_unittest.TestCase):
 
         fnr_filter = grgsm.burst_fnr_filter(grgsm.FILTER_GREATER_OR_EQUAL, 1500123)
         
-        src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input)
-        sink = grgsm.burst_sink_qa()
+        src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input)
+        sink = grgsm.burst_sink()
 
         self.tb.msg_connect(src, "out", fnr_filter, "in")
         self.tb.msg_connect(fnr_filter, "out", sink, "in")
diff --git a/python/qa_burst_sdcch_subslot_splitter.py b/python/qa_burst_sdcch_subslot_splitter.py
index 6a68ebe..ff30c2b 100755
--- a/python/qa_burst_sdcch_subslot_splitter.py
+++ b/python/qa_burst_sdcch_subslot_splitter.py
@@ -267,16 +267,16 @@ class qa_burst_sdcch_subslot_splitter (gr_unittest.TestCase):
             '0000110000111101100001011100100011101011011000111100001000000111011110001001011101111000111000000111100100101000000101100011011001111100110011110000',
         ]
 
-        src = grgsm.burst_source_qa(self.framenumbers_input, self.timeslots_input, self.bursts_input)
+        src = grgsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input)
         splitter = grgsm.burst_sdcch_subslot_splitter(grgsm.SPLITTER_SDCCH8)
-        sink_0 = grgsm.burst_sink_qa()
-        sink_1 = grgsm.burst_sink_qa()
-        sink_2 = grgsm.burst_sink_qa()
-        sink_3 = grgsm.burst_sink_qa()
-        sink_4 = grgsm.burst_sink_qa()
-        sink_5 = grgsm.burst_sink_qa()
-        sink_6 = grgsm.burst_sink_qa()
-        sink_7 = grgsm.burst_sink_qa()
+        sink_0 = grgsm.burst_sink()
+        sink_1 = grgsm.burst_sink()
+        sink_2 = grgsm.burst_sink()
+        sink_3 = grgsm.burst_sink()
+        sink_4 = grgsm.burst_sink()
+        sink_5 = grgsm.burst_sink()
+        sink_6 = grgsm.burst_sink()
+        sink_7 = grgsm.burst_sink()
 
         self.tb.msg_connect(src, "out", splitter, "in")
         self.tb.msg_connect(splitter, "out0", sink_0, "in")
@@ -371,12 +371,12 @@ class qa_burst_sdcch_subslot_splitter (gr_unittest.TestCase):
             '0000100001011010001010000101110000111100011110110010000010101000110101110010000011010111010001010101111111111101101100110101111010110100001110101000',
         ]
         
-        src = grgsm.burst_source_qa(self.framenumbers_input, self.timeslots_input, self.bursts_input)
+        src = grgsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input)
         splitter = grgsm.burst_sdcch_subslot_splitter(grgsm.SPLITTER_SDCCH4)
-        sink_0 = grgsm.burst_sink_qa()
-        sink_1 = grgsm.burst_sink_qa()
-        sink_2 = grgsm.burst_sink_qa()
-        sink_3 = grgsm.burst_sink_qa()
+        sink_0 = grgsm.burst_sink()
+        sink_1 = grgsm.burst_sink()
+        sink_2 = grgsm.burst_sink()
+        sink_3 = grgsm.burst_sink()
 
         self.tb.msg_connect(src, "out", splitter, "in")
         self.tb.msg_connect(splitter, "out0", sink_0, "in")
diff --git a/python/qa_burst_timeslot_splitter.py b/python/qa_burst_timeslot_splitter.py
index 8be3e52..b162a2e 100755
--- a/python/qa_burst_timeslot_splitter.py
+++ b/python/qa_burst_timeslot_splitter.py
@@ -115,16 +115,16 @@ class qa_burst_timeslot_splitter (gr_unittest.TestCase):
         ]
 
 
-        src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input)
+        src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input)
         splitter = grgsm.burst_timeslot_splitter()
-        sink_0 = grgsm.burst_sink_qa()
-        sink_1 = grgsm.burst_sink_qa()
-        sink_2 = grgsm.burst_sink_qa()
-        sink_3 = grgsm.burst_sink_qa()
-        sink_4 = grgsm.burst_sink_qa()
-        sink_5 = grgsm.burst_sink_qa()
-        sink_6 = grgsm.burst_sink_qa()
-        sink_7 = grgsm.burst_sink_qa()
+        sink_0 = grgsm.burst_sink()
+        sink_1 = grgsm.burst_sink()
+        sink_2 = grgsm.burst_sink()
+        sink_3 = grgsm.burst_sink()
+        sink_4 = grgsm.burst_sink()
+        sink_5 = grgsm.burst_sink()
+        sink_6 = grgsm.burst_sink()
+        sink_7 = grgsm.burst_sink()
 
         self.tb.msg_connect(src, "out", splitter, "in")
         self.tb.msg_connect(splitter, "out0", sink_0, "in")
diff --git a/python/qa_dummy_burst_filter.py b/python/qa_dummy_burst_filter.py
index 3988ce8..5a78890 100755
--- a/python/qa_dummy_burst_filter.py
+++ b/python/qa_dummy_burst_filter.py
@@ -85,8 +85,8 @@ class qa_dummy_burst_filter (gr_unittest.TestCase):
 
         dummy_burst_filter = grgsm.dummy_burst_filter()
         
-        src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input)
-        sink = grgsm.burst_sink_qa()
+        src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input)
+        sink = grgsm.burst_sink()
 
         self.tb.msg_connect(src, "out", dummy_burst_filter, "in")
         self.tb.msg_connect(dummy_burst_filter, "out", sink, "in")