diff --git a/grc/cdc_phy_rx.block.yml b/grc/cdc_phy_rx.block.yml
index 6a806a2eae53e1a6f9c207f6660fbdc4b650541b..0e3ea5040a606b9399113033c6031a2dd0747023 100644
--- a/grc/cdc_phy_rx.block.yml
+++ b/grc/cdc_phy_rx.block.yml
@@ -46,11 +46,11 @@ outputs:
     optional: true
 
 templates:
-    imports: 'from phy_rx import phy_rx  # grc-generated hier_block'
-    make: "phy_rx(\n    excess_bw=${ excess_bw },\n    sps=${ sps },\n)"
+    imports: from gnuradio import cdc
+    make: cdc.phy_rx(excess_bw=${excess_bw}, sps=${sps})
     callbacks:
-    - set_excess_bw(${ excess_bw })
-    - set_sps(${ sps })
+    - set_excess_bw(${excess_bw})
+    - set_sps(${sps})
 
 documentation: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/phy_rx.py
 grc_source: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/cdc_phy_rx.grc
diff --git a/grc/cdc_phy_tx.block.yml b/grc/cdc_phy_tx.block.yml
index 8f58df9553bab0f5a5fe52ba329ef5577c55e5e6..6fc7bbc5bd5d2e87268d34fa14a505b814a8f23b 100644
--- a/grc/cdc_phy_tx.block.yml
+++ b/grc/cdc_phy_tx.block.yml
@@ -39,13 +39,12 @@ outputs:
     optional: true
 
 templates:
-    imports: 'from phy_tx import phy_tx  # grc-generated hier_block'
-    make: "phy_tx(\n    excess_bw=${ excess_bw },\n    phasing=${ phasing },\n   \
-        \ sps=${ sps },\n)"
+    imports: from gnuradio import cdc 
+    make: cdc.phy_tx(excess_bw=${excess_bw}, phasing=${phasing}, sps=${sps})
     callbacks:
-    - set_excess_bw(${ excess_bw })
-    - set_phasing(${ phasing })
-    - set_sps(${ sps })
+    - set_excess_bw(${excess_bw})
+    - set_phasing(${phasing})
+    - set_sps(${sps})
 
 documentation: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/phy_tx.py
 grc_source: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/cdc_phy_tx.grc