diff --git a/examples/wifi_loopback.grc b/examples/wifi_loopback.grc
index 91e7fcd..67ca3a9 100644
--- a/examples/wifi_loopback.grc
+++ b/examples/wifi_loopback.grc
@@ -419,7 +419,7 @@
     </param>
     <param>
       <key>file</key>
-      <value>/tmp/ofdm.bin</value>
+      <value>/tmp/wifi.bin</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -761,7 +761,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_mac</key>
+    <key>ieee802_11_mac</key>
     <param>
       <key>bss_mac</key>
       <value>[0xff, 0xff, 0xff, 0xff, 0xff, 0xff]</value>
@@ -796,7 +796,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_mac_0</value>
+      <value>ieee802_11_mac_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -812,7 +812,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_parse_mac</key>
+    <key>ieee802_11_parse_mac</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -843,7 +843,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_parse_mac_0</value>
+      <value>ieee802_11_parse_mac_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1097,7 +1097,7 @@
   </block>
   <connection>
     <source_block_id>blocks_message_strobe_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>strobe</source_key>
     <sink_key>app in</sink_key>
   </connection>
@@ -1132,13 +1132,13 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
+    <source_block_id>ieee802_11_mac_0</source_block_id>
     <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>phy out</source_key>
     <sink_key>mac_in</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_parse_mac_0</source_block_id>
+    <source_block_id>ieee802_11_parse_mac_0</source_block_id>
     <sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
     <source_key>fer</source_key>
     <sink_key>pdus</sink_key>
@@ -1157,7 +1157,7 @@
   </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_parse_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_parse_mac_0</sink_block_id>
     <source_key>mac_out</source_key>
     <sink_key>in</sink_key>
   </connection>
diff --git a/examples/wifi_phy_hier.grc b/examples/wifi_phy_hier.grc
index 26d0447..da44148 100644
--- a/examples/wifi_phy_hier.grc
+++ b/examples/wifi_phy_hier.grc
@@ -105,7 +105,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>ieee802_11.wifi_signal_field()</value>
+      <value>ieee802_11.signal_field()</value>
     </param>
   </block>
   <block>
@@ -1257,7 +1257,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_decode_mac</key>
+    <key>ieee802_11_decode_mac</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1288,7 +1288,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_decode_mac_0</value>
+      <value>ieee802_11_decode_mac_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1304,7 +1304,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_decode_signal</key>
+    <key>ieee802_11_decode_signal</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1335,7 +1335,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_decode_signal_0</value>
+      <value>ieee802_11_decode_signal_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1351,7 +1351,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_equalize_symbols</key>
+    <key>ieee802_11_equalize_symbols</key>
     <param>
       <key>algo</key>
       <value>chan_est</value>
@@ -1386,7 +1386,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_equalize_symbols_0</value>
+      <value>ieee802_11_equalize_symbols_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1398,7 +1398,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_mapper</key>
+    <key>ieee802_11_mapper</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1433,7 +1433,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_mapper_0</value>
+      <value>ieee802_11_mapper_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1703,7 +1703,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_sync_long</key>
+    <key>ieee802_11_sync_long</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1754,7 +1754,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_sync_short</key>
+    <key>ieee802_11_sync_short</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1906,7 +1906,7 @@
   </connection>
   <connection>
     <source_block_id>fft_vxx_0_1</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_equalize_symbols_0</sink_block_id>
+    <sink_block_id>ieee802_11_equalize_symbols_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1935,37 +1935,37 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_mac_0</source_block_id>
+    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
     <sink_block_id>pad_sink_2</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_signal_0</source_block_id>
+    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
     <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_signal_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_decode_mac_0</sink_block_id>
+    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
+    <sink_block_id>ieee802_11_decode_mac_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_equalize_symbols_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_decode_signal_0</sink_block_id>
+    <source_block_id>ieee802_11_equalize_symbols_0</source_block_id>
+    <sink_block_id>ieee802_11_decode_signal_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mapper_0</source_block_id>
+    <source_block_id>ieee802_11_mapper_0</source_block_id>
     <sink_block_id>digital_packet_headergenerator_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mapper_0</source_block_id>
+    <source_block_id>ieee802_11_mapper_0</source_block_id>
     <sink_block_id>ieee802_11_chunks_to_symbols_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1990,7 +1990,7 @@
   </connection>
   <connection>
     <source_block_id>pad_source_1</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mapper_0</sink_block_id>
+    <sink_block_id>ieee802_11_mapper_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in</sink_key>
   </connection>
diff --git a/examples/wifi_rx.grc b/examples/wifi_rx.grc
index df0aaba..445a00a 100644
--- a/examples/wifi_rx.grc
+++ b/examples/wifi_rx.grc
@@ -724,7 +724,7 @@
     </param>
     <param>
       <key>file</key>
-      <value>/tmp/ofdm.pcap</value>
+      <value>/tmp/wifi.pcap</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -1156,7 +1156,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_decode_mac</key>
+    <key>ieee802_11_decode_mac</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1187,7 +1187,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_decode_mac_0</value>
+      <value>ieee802_11_decode_mac_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1203,7 +1203,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_decode_signal</key>
+    <key>ieee802_11_decode_signal</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1234,7 +1234,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_decode_signal_0</value>
+      <value>ieee802_11_decode_signal_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1250,7 +1250,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_equalize_symbols</key>
+    <key>ieee802_11_equalize_symbols</key>
     <param>
       <key>algo</key>
       <value>chan_est</value>
@@ -1285,7 +1285,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_equalize_symbols_0</value>
+      <value>ieee802_11_equalize_symbols_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1297,7 +1297,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_parse_mac</key>
+    <key>ieee802_11_parse_mac</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1328,7 +1328,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_parse_mac_0</value>
+      <value>ieee802_11_parse_mac_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1344,7 +1344,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_sync_long</key>
+    <key>ieee802_11_sync_long</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1375,7 +1375,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_sync_long_0</value>
+      <value>ieee802_11_sync_long_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1395,7 +1395,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_sync_short</key>
+    <key>ieee802_11_sync_short</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1426,7 +1426,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_sync_short_0</value>
+      <value>ieee802_11_sync_short_0</value>
     </param>
     <param>
       <key>log</key>
@@ -2864,7 +2864,7 @@
   </connection>
   <connection>
     <source_block_id>blocks_delay_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_sync_long_0</sink_block_id>
+    <sink_block_id>ieee802_11_sync_long_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
@@ -2876,13 +2876,13 @@
   </connection>
   <connection>
     <source_block_id>blocks_delay_0_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_sync_short_0</sink_block_id>
+    <sink_block_id>ieee802_11_sync_short_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>blocks_divide_xx_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_sync_short_0</sink_block_id>
+    <sink_block_id>ieee802_11_sync_short_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>2</sink_key>
   </connection>
@@ -2918,7 +2918,7 @@
   </connection>
   <connection>
     <source_block_id>fft_vxx_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_equalize_symbols_0</sink_block_id>
+    <sink_block_id>ieee802_11_equalize_symbols_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2936,7 +2936,7 @@
   </connection>
   <connection>
     <source_block_id>ieee802_11_moving_average_xx_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_sync_short_0</sink_block_id>
+    <sink_block_id>ieee802_11_sync_short_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
@@ -2947,56 +2947,56 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_mac_0</source_block_id>
+    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
     <sink_block_id>foo_wireshark_connector_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_mac_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_parse_mac_0</sink_block_id>
+    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
+    <sink_block_id>ieee802_11_parse_mac_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_signal_0</source_block_id>
+    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
     <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_decode_signal_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_decode_mac_0</sink_block_id>
+    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
+    <sink_block_id>ieee802_11_decode_mac_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_equalize_symbols_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_decode_signal_0</sink_block_id>
+    <source_block_id>ieee802_11_equalize_symbols_0</source_block_id>
+    <sink_block_id>ieee802_11_decode_signal_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_parse_mac_0</source_block_id>
+    <source_block_id>ieee802_11_parse_mac_0</source_block_id>
     <sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
     <source_key>fer</source_key>
     <sink_key>pdus</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_sync_long_0</source_block_id>
+    <source_block_id>ieee802_11_sync_long_0</source_block_id>
     <sink_block_id>blocks_stream_to_vector_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_sync_short_0</source_block_id>
+    <source_block_id>ieee802_11_sync_short_0</source_block_id>
     <sink_block_id>blocks_delay_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_sync_short_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_sync_long_0</sink_block_id>
+    <source_block_id>ieee802_11_sync_short_0</source_block_id>
+    <sink_block_id>ieee802_11_sync_long_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc
index 03245b2..e695c01 100644
--- a/examples/wifi_transceiver.grc
+++ b/examples/wifi_transceiver.grc
@@ -503,7 +503,7 @@
     </param>
     <param>
       <key>file</key>
-      <value>/tmp/ofdm.pcap</value>
+      <value>/tmp/wifi.pcap</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -782,7 +782,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_mac</key>
+    <key>ieee802_11_mac</key>
     <param>
       <key>bss_mac</key>
       <value>[0x42, 0x42, 0x42, 0x42, 0x42, 0x42]</value>
@@ -817,7 +817,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_mac_0</value>
+      <value>ieee802_11_mac_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -833,7 +833,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_parse_mac</key>
+    <key>ieee802_11_parse_mac</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -864,7 +864,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_parse_mac_0</value>
+      <value>ieee802_11_parse_mac_0</value>
     </param>
     <param>
       <key>log</key>
@@ -2947,12 +2947,12 @@
   </connection>
   <connection>
     <source_block_id>ieee802_11_ether_encap_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>to wifi</source_key>
     <sink_key>app in</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
+    <source_block_id>ieee802_11_mac_0</source_block_id>
     <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>phy out</source_key>
     <sink_key>mac_in</sink_key>
@@ -2983,13 +2983,13 @@
   </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>mac_out</source_key>
     <sink_key>phy in</sink_key>
   </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_parse_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_parse_mac_0</sink_block_id>
     <source_key>mac_out</source_key>
     <sink_key>in</sink_key>
   </connection>
diff --git a/examples/wifi_tx.grc b/examples/wifi_tx.grc
index 5b4d182..12c1fef 100644
--- a/examples/wifi_tx.grc
+++ b/examples/wifi_tx.grc
@@ -883,7 +883,7 @@
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_mac</key>
+    <key>ieee802_11_mac</key>
     <param>
       <key>bss_mac</key>
       <value>[0xff, 0xff, 0xff, 0xff, 0xff, 255]</value>
@@ -918,7 +918,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_mac_0</value>
+      <value>ieee802_11_mac_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1805,7 +1805,7 @@
   </block>
   <connection>
     <source_block_id>blocks_message_strobe_0_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>strobe</source_key>
     <sink_key>app in</sink_key>
   </connection>
@@ -1823,7 +1823,7 @@
   </connection>
   <connection>
     <source_block_id>blocks_socket_pdu_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>pdus</source_key>
     <sink_key>app in</sink_key>
   </connection>
@@ -1834,7 +1834,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
+    <source_block_id>ieee802_11_mac_0</source_block_id>
     <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>phy out</source_key>
     <sink_key>mac_in</sink_key>
@@ -1847,7 +1847,7 @@
   </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>mac_out</source_key>
     <sink_key>phy in</sink_key>
   </connection>