summaryrefslogtreecommitdiff
path: root/grc/blocks
diff options
context:
space:
mode:
Diffstat (limited to 'grc/blocks')
-rw-r--r--grc/blocks/blks2_pfb_arb_resampler.xml2
-rw-r--r--grc/blocks/blks2_pfb_channelizer.xml2
-rw-r--r--grc/blocks/block_tree.xml275
-rw-r--r--grc/blocks/gr_add_const_vxx.xml2
-rw-r--r--grc/blocks/gr_add_xx.xml2
-rw-r--r--grc/blocks/gr_additive_scrambler_bb.xml2
-rw-r--r--grc/blocks/gr_agc2_xx.xml2
-rw-r--r--grc/blocks/gr_agc_xx.xml2
-rw-r--r--grc/blocks/gr_and_const_xx.xml2
-rw-r--r--grc/blocks/gr_and_xx.xml2
-rw-r--r--grc/blocks/gr_argmax_xx.xml2
-rw-r--r--grc/blocks/gr_burst_tagger.xml2
-rw-r--r--grc/blocks/gr_channel_model.xml2
-rw-r--r--grc/blocks/gr_char_to_float.xml2
-rw-r--r--grc/blocks/gr_char_to_short.xml2
-rw-r--r--grc/blocks/gr_chunks_to_symbols.xml2
-rw-r--r--grc/blocks/gr_complex_to_arg.xml2
-rw-r--r--grc/blocks/gr_complex_to_float.xml2
-rw-r--r--grc/blocks/gr_complex_to_imag.xml2
-rw-r--r--grc/blocks/gr_complex_to_interleaved_short.xml2
-rw-r--r--grc/blocks/gr_complex_to_mag.xml2
-rw-r--r--grc/blocks/gr_complex_to_mag_squared.xml2
-rw-r--r--grc/blocks/gr_complex_to_real.xml2
-rw-r--r--grc/blocks/gr_conjugate_cc.xml2
-rw-r--r--grc/blocks/gr_copy.xml2
-rw-r--r--grc/blocks/gr_cpfsk_bc.xml2
-rw-r--r--grc/blocks/gr_ctcss_squelch_ff.xml2
-rw-r--r--grc/blocks/gr_dc_blocker.xml2
-rw-r--r--grc/blocks/gr_deinterleave.xml2
-rw-r--r--grc/blocks/gr_delay.xml2
-rw-r--r--grc/blocks/gr_descrambler_bb.xml2
-rw-r--r--grc/blocks/gr_diff_decoder_bb.xml2
-rw-r--r--grc/blocks/gr_diff_encoder_bb.xml2
-rw-r--r--grc/blocks/gr_diff_phasor_cc.xml2
-rw-r--r--grc/blocks/gr_divide_xx.xml2
-rw-r--r--grc/blocks/gr_dpll_bb.xml2
-rw-r--r--grc/blocks/gr_endian_swap.xml2
-rw-r--r--grc/blocks/gr_feedforward_agc_cc.xml2
-rw-r--r--grc/blocks/gr_fft_filter_xxx.xml2
-rw-r--r--grc/blocks/gr_fft_vxx.xml2
-rw-r--r--grc/blocks/gr_file_sink.xml2
-rw-r--r--grc/blocks/gr_file_source.xml2
-rw-r--r--grc/blocks/gr_filter_delay_fc.xml2
-rw-r--r--grc/blocks/gr_fir_filter_xxx.xml2
-rw-r--r--grc/blocks/gr_float_to_char.xml2
-rw-r--r--grc/blocks/gr_float_to_complex.xml2
-rw-r--r--grc/blocks/gr_float_to_int.xml2
-rw-r--r--grc/blocks/gr_float_to_short.xml2
-rw-r--r--grc/blocks/gr_float_to_uchar.xml2
-rw-r--r--grc/blocks/gr_fractional_interpolator_xx.xml2
-rw-r--r--grc/blocks/gr_freq_xlating_fir_filter_xxx.xml2
-rw-r--r--grc/blocks/gr_frequency_modulator_fc.xml2
-rw-r--r--grc/blocks/gr_glfsr_source_x.xml2
-rw-r--r--grc/blocks/gr_goertzel_fc.xml2
-rw-r--r--grc/blocks/gr_head.xml2
-rw-r--r--grc/blocks/gr_hilbert_fc.xml2
-rw-r--r--grc/blocks/gr_iir_filter_ffd.xml2
-rw-r--r--grc/blocks/gr_int_to_float.xml2
-rw-r--r--grc/blocks/gr_integrate_xx.xml2
-rw-r--r--grc/blocks/gr_interleave.xml2
-rw-r--r--grc/blocks/gr_interleaved_short_to_complex.xml2
-rw-r--r--grc/blocks/gr_interp_fir_filter_xxx.xml2
-rw-r--r--grc/blocks/gr_keep_m_in_n.xml2
-rw-r--r--grc/blocks/gr_keep_one_in_n.xml2
-rw-r--r--grc/blocks/gr_kludge_copy.xml2
-rw-r--r--grc/blocks/gr_map_bb.xml2
-rw-r--r--grc/blocks/gr_max_xx.xml2
-rw-r--r--grc/blocks/gr_message_burst_source.xml2
-rw-r--r--grc/blocks/gr_message_debug.xml2
-rw-r--r--grc/blocks/gr_message_sink.xml2
-rw-r--r--grc/blocks/gr_message_source.xml2
-rw-r--r--grc/blocks/gr_message_strobe.xml2
-rw-r--r--grc/blocks/gr_moving_average_xx.xml2
-rw-r--r--grc/blocks/gr_mpsk_sync_cc.xml69
-rw-r--r--grc/blocks/gr_multiply_const_vxx.xml2
-rw-r--r--grc/blocks/gr_multiply_xx.xml2
-rw-r--r--grc/blocks/gr_mute_xx.xml2
-rw-r--r--grc/blocks/gr_nlog10_ff.xml2
-rw-r--r--grc/blocks/gr_noise_source_x.xml2
-rw-r--r--grc/blocks/gr_nop.xml2
-rw-r--r--grc/blocks/gr_not_xx.xml2
-rw-r--r--grc/blocks/gr_null_sink.xml2
-rw-r--r--grc/blocks/gr_null_source.xml2
-rw-r--r--grc/blocks/gr_or_xx.xml2
-rw-r--r--grc/blocks/gr_pack_k_bits_bb.xml2
-rw-r--r--grc/blocks/gr_packed_to_unpacked_xx.xml2
-rw-r--r--grc/blocks/gr_pdu_to_tagged_stream.xml2
-rw-r--r--grc/blocks/gr_peak_detector2_fb.xml2
-rw-r--r--grc/blocks/gr_peak_detector_xb.xml2
-rw-r--r--grc/blocks/gr_pfb_clock_sync.xml2
-rw-r--r--grc/blocks/gr_pfb_synthesizer.xml2
-rw-r--r--grc/blocks/gr_phase_modulator_fc.xml2
-rw-r--r--grc/blocks/gr_pll_carriertracking_cc.xml2
-rw-r--r--grc/blocks/gr_pll_freqdet_cf.xml2
-rw-r--r--grc/blocks/gr_pll_refout_cc.xml2
-rw-r--r--grc/blocks/gr_pn_correlator_cc.xml2
-rw-r--r--grc/blocks/gr_probe_avg_mag_sqrd_x.xml2
-rw-r--r--grc/blocks/gr_probe_density_b.xml2
-rw-r--r--grc/blocks/gr_probe_signal_f.xml2
-rw-r--r--grc/blocks/gr_pwr_squelch_xx.xml2
-rw-r--r--grc/blocks/gr_quadrature_demod_cf.xml2
-rw-r--r--grc/blocks/gr_rational_resampler_base_xxx.xml2
-rw-r--r--grc/blocks/gr_repeat.xml2
-rw-r--r--grc/blocks/gr_rms_xx.xml2
-rw-r--r--grc/blocks/gr_sample_and_hold_xx.xml2
-rw-r--r--grc/blocks/gr_scrambler_bb.xml2
-rw-r--r--grc/blocks/gr_short_to_char.xml2
-rw-r--r--grc/blocks/gr_short_to_float.xml2
-rw-r--r--grc/blocks/gr_sig_source_x.xml2
-rw-r--r--grc/blocks/gr_simple_correlator.xml2
-rw-r--r--grc/blocks/gr_simple_framer.xml2
-rw-r--r--grc/blocks/gr_simple_squelch_cc.xml2
-rw-r--r--grc/blocks/gr_single_pole_iir_filter_xx.xml2
-rw-r--r--grc/blocks/gr_skiphead.xml2
-rw-r--r--grc/blocks/gr_socket_pdu.xml2
-rw-r--r--grc/blocks/gr_stream_mux.xml2
-rw-r--r--grc/blocks/gr_stream_to_streams.xml2
-rw-r--r--grc/blocks/gr_stream_to_vector.xml2
-rw-r--r--grc/blocks/gr_streams_to_stream.xml2
-rw-r--r--grc/blocks/gr_streams_to_vector.xml2
-rw-r--r--grc/blocks/gr_sub_xx.xml2
-rw-r--r--grc/blocks/gr_tag_debug.xml2
-rw-r--r--grc/blocks/gr_tagged_stream_to_pdu.xml2
-rw-r--r--grc/blocks/gr_threshold_ff.xml2
-rw-r--r--grc/blocks/gr_throttle.xml2
-rw-r--r--grc/blocks/gr_transcendental.xml2
-rw-r--r--grc/blocks/gr_tuntap_pdu.xml2
-rw-r--r--grc/blocks/gr_uchar_to_float.xml2
-rw-r--r--grc/blocks/gr_udp_sink.xml2
-rw-r--r--grc/blocks/gr_udp_source.xml2
-rw-r--r--grc/blocks/gr_unpack_k_bits_bb.xml2
-rw-r--r--grc/blocks/gr_unpacked_to_packed_xx.xml2
-rw-r--r--grc/blocks/gr_vco_f.xml2
-rw-r--r--grc/blocks/gr_vector_insert_x.xml2
-rw-r--r--grc/blocks/gr_vector_sink_x.xml2
-rw-r--r--grc/blocks/gr_vector_source_x.xml2
-rw-r--r--grc/blocks/gr_vector_to_stream.xml2
-rw-r--r--grc/blocks/gr_vector_to_streams.xml2
-rw-r--r--grc/blocks/gr_wavfile_sink.xml2
-rw-r--r--grc/blocks/gr_wavfile_source.xml2
-rw-r--r--grc/blocks/gr_xor_xx.xml2
141 files changed, 184 insertions, 438 deletions
diff --git a/grc/blocks/blks2_pfb_arb_resampler.xml b/grc/blocks/blks2_pfb_arb_resampler.xml
index b58e70f1cb..aef83dd91a 100644
--- a/grc/blocks/blks2_pfb_arb_resampler.xml
+++ b/grc/blocks/blks2_pfb_arb_resampler.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Polyphase Resampler</name>
+ <name>Polyphase Resampler (old)</name>
<key>blks2_pfb_arb_resampler_ccf</key>
<import>from gnuradio import blks2</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/blks2_pfb_channelizer.xml b/grc/blocks/blks2_pfb_channelizer.xml
index 5a93c08664..6184749cd0 100644
--- a/grc/blocks/blks2_pfb_channelizer.xml
+++ b/grc/blocks/blks2_pfb_channelizer.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Polyphase Channelizer</name>
+ <name>Polyphase Channelizer (old)</name>
<key>blks2_pfb_channelizer_ccf</key>
<import>from gnuradio import blks2</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index dcd6c54483..5f10bdf7ef 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -7,168 +7,6 @@
<cat>
<name></name> <!-- Blank for Root Name -->
<cat>
- <name>Sources</name>
- <block>const_source_x</block>
- <block>gr_sig_source_x</block>
- <block>gr_noise_source_x</block>
- <block>gr_vector_source_x</block>
- <block>random_source_x</block>
- <block>gr_glfsr_source_x</block>
- <block>gr_null_source</block>
- <block>gr_file_source</block>
- <block>blks2_tcp_source</block>
- <block>gr_udp_source</block>
- <block>gr_wavfile_source</block>
- <block>gr_message_source</block>
- <block>gr_message_burst_source</block>
- <block>pad_source</block>
- <block>virtual_source</block>
- </cat>
- <cat>
- <name>Sinks</name>
- <block>gr_vector_sink_x</block>
- <block>gr_null_sink</block>
- <block>gr_file_sink</block>
- <block>blks2_tcp_sink</block>
- <block>gr_udp_sink</block>
- <block>gr_wavfile_sink</block>
- <block>gr_message_sink</block>
- <block>pad_sink</block>
- <block>virtual_sink</block>
- <block>gr_tag_debug</block>
- </cat>
- <cat>
- <name>Message Tools</name>
- <block>gr_message_debug</block>
- <block>gr_message_strobe</block>
- <block>gr_pdu_to_tagged_stream</block>
- <block>gr_tagged_stream_to_pdu</block>
- <block>gr_tuntap_pdu</block>
- <block>gr_socket_pdu</block>
- <block>gr_random_pdu</block>
- </cat>
- <cat>
- <name>Operators</name>
- <block>gr_add_xx</block>
- <block>gr_sub_xx</block>
- <block>gr_multiply_xx</block>
- <block>gr_divide_xx</block>
- <block>gr_nlog10_ff</block>
- <block>gr_transcendental</block>
- <block>gr_add_const_vxx</block>
- <block>gr_multiply_const_vxx</block>
- <block>gr_and_const_xx</block>
-
- <block>gr_not_xx</block>
- <block>gr_and_xx</block>
- <block>gr_or_xx</block>
- <block>gr_xor_xx</block>
-
- <block>gr_max_xx</block>
- <block>gr_argmax_xx</block>
- <block>gr_rms_xx</block>
- <block>gr_integrate_xx</block>
-
- <block>gr_conjugate_cc</block>
-
- <block>gr_fft_vxx</block>
- <block>blks2_logpwrfft_x</block>
- <block>gr_vector_insert_x</block>
-
- <block>gr_endian_swap</block>
- </cat>
- <cat>
- <name>Type Conversions</name>
- <block>gr_complex_to_arg</block>
- <block>gr_complex_to_mag</block>
- <block>gr_complex_to_mag_squared</block>
- <block>gr_complex_to_real</block>
- <block>gr_complex_to_imag</block>
-
- <block>gr_complex_to_float</block>
- <block>gr_float_to_complex</block>
-
- <block>gr_float_to_int</block>
- <block>gr_float_to_short</block>
- <block>gr_short_to_float</block>
- <block>gr_short_to_char</block>
-
- <block>gr_int_to_float</block>
-
- <block>gr_float_to_char</block>
- <block>gr_char_to_float</block>
- <block>gr_char_to_short</block>
-
- <block>gr_float_to_uchar</block>
- <block>gr_uchar_to_float</block>
-
- <block>gr_complex_to_interleaved_short</block>
- <block>gr_interleaved_short_to_complex</block>
- </cat>
- <cat>
- <name>Stream Conversions</name>
- <block>gr_interleave</block>
- <block>gr_deinterleave</block>
-
- <block>gr_streams_to_stream</block>
- <block>gr_stream_to_streams</block>
-
- <block>gr_streams_to_vector</block>
- <block>gr_vector_to_streams</block>
-
- <block>gr_stream_to_vector</block>
- <block>gr_vector_to_stream</block>
-
- <block>blks2_stream_to_vector_decimator</block>
-
- <block>gr_stream_mux</block>
- <block>gr_burst_tagger</block>
- </cat>
- <cat>
- <name>Misc Conversions</name>
- <block>gr_unpacked_to_packed_xx</block>
- <block>gr_packed_to_unpacked_xx</block>
- <block>gr_unpack_k_bits_bb</block>
- <block>gr_pack_k_bits_bb</block>
- <block>gr_chunks_to_symbols_xx</block>
- <block>gr_map_bb</block>
- </cat>
- <cat>
- <name>Synchronizers</name>
- <block>gr_pfb_clock_sync_xxx</block>
-
- <block>gr_mpsk_sync_cc</block>
-
- <block>gr_pll_carriertracking_cc</block>
- <block>gr_pll_freqdet_cf</block>
- <block>gr_pll_refout_cc</block>
-
- <block>gr_pn_correlator_cc</block>
- <block>gr_simple_correlator</block>
- <block>gr_simple_framer</block>
-
- <block>blks2_packet_decoder</block>
- <block>blks2_packet_encoder</block>
- </cat>
- <cat>
- <name>Level Controls</name>
- <block>gr_dpll_bb</block>
- <block>gr_peak_detector_xb</block>
- <block>gr_peak_detector2_fb</block>
- <block>gr_sample_and_hold_xx</block>
-
- <block>gr_agc_xx</block>
- <block>gr_agc2_xx</block>
- <block>gr_feedforward_agc_cc</block>
-
- <block>gr_mute_xx</block>
- <block>gr_simple_squelch_cc</block>
- <block>blks2_standard_squelch</block>
- <block>gr_pwr_squelch_xx</block>
- <block>gr_ctcss_squelch_ff</block>
- <block>gr_threshold_ff</block>
- </cat>
- <cat>
<name>Filters</name>
<!-- FIR convenience filters -->
<block>low_pass_filter</block>
@@ -176,47 +14,49 @@
<block>band_pass_filter</block>
<block>band_reject_filter</block>
<block>root_raised_cosine_filter</block>
- <!-- Filters that take taps as arguments -->
- <block>gr_fir_filter_xxx</block>
- <block>gr_interp_fir_filter_xxx</block>
- <block>gr_fft_filter_xxx</block>
- <block>gr_freq_xlating_fir_filter_xxx</block>
- <block>gr_iir_filter_ffd</block>
- <block>gr_filter_delay_fc</block>
- <block>gr_channel_model</block>
<!-- Filter banks -->
<block>blks2_synthesis_filterbank</block>
<block>blks2_analysis_filterbank</block>
- <!-- Polyphase filters -->
- <block>blks2_pfb_arb_resampler_ccf</block>
- <block>blks2_pfb_channelizer_ccf</block>
- <block>gr_pfb_synthesizer_ccf</block>
<!-- Other filters -->
- <block>gr_single_pole_iir_filter_xx</block>
- <block>gr_hilbert_fc</block>
- <block>gr_goertzel_fc</block>
- <block>gr_rational_resampler_base_xxx</block>
<block>blks2_rational_resampler_xxx</block>
- <block>gr_fractional_interpolator_xx</block>
- <block>gr_keep_one_in_n</block>
- <block>gr_keep_m_in_n</block>
- <block>gr_moving_average_xx</block>
<block>gr_iqcomp_cc</block>
- <block>gr_dc_blocker</block>
</cat>
<cat>
- <name>Modulators</name>
- <block>gr_vco_f</block>
- <block>gr_frequency_modulator_fc</block>
- <block>gr_phase_modulator_fc</block>
- <block>gr_quadrature_demod_cf</block>
- <block>gr_cpfsk_bc</block>
+ <name>Error Coding</name>
+ <block>gr_encode_ccsds_27_bb</block>
+ <block>gr_decode_ccsds_27_fb</block>
+ </cat>
+ <cat>
+ <name>Fourier Analysis</name>
+ <block>blks2_logpwrfft_x</block>
+ </cat>
+ <cat>
+ <name>Level Controllers</name>
+ <block>blks2_standard_squelch</block>
+ </cat>
+ <cat>
+ <name>Message Tools</name>
+ <block>gr_random_pdu</block>
+ </cat>
+ <cat>
+ <name>Misc</name>
+ <block>pad_source</block>
+ <block>pad_sink</block>
+ <block>virtual_source</block>
+ <block>virtual_sink</block>
- <block>gr_diff_phasor_cc</block>
+ <block>note</block>
+ <block>import</block>
- <block>gr_diff_encoder_bb</block>
- <block>gr_diff_decoder_bb</block>
+ <block>blks2_selector</block>
+ <block>blks2_valve</block>
+ <block>blks2_error_rate</block>
+ <block>xmlrpc_server</block>
+ <block>xmlrpc_client</block>
+ </cat>
+ <cat>
+ <name>Modulators</name>
<block>blks2_wfm_tx</block>
<block>blks2_wfm_rcv</block>
<block>blks2_wfm_rcv_pll</block>
@@ -230,25 +70,23 @@
<block>blks2_fm_preemph</block>
</cat>
<cat>
- <name>Error Correction</name>
- <cat>
- <name>Trellis</name>
- </cat>
-
- <block>gr_encode_ccsds_27_bb</block>
- <block>gr_decode_ccsds_27_fb</block>
+ <name>Networking Tool</name>
+ <block>blks2_tcp_source</block>
+ <block>blks2_tcp_sink</block>
</cat>
<cat>
- <name>Line Coding</name>
- <block>gr_scrambler_bb</block>
- <block>gr_descrambler_bb</block>
- <block>gr_additive_scrambler_bb</block>
+ <name>Synchronizers</name>
+ <block>blks2_packet_decoder</block>
+ <block>blks2_packet_encoder</block>
</cat>
<cat>
- <name>Probes</name>
- <block>gr_probe_avg_mag_sqrd_x</block>
- <block>gr_probe_density_b</block>
- <block>gr_probe_signal_f</block>
+ <name>Type Converters</name>
+ <block>blks2_stream_to_vector_decimator</block>
+ </cat>
+ <cat>
+ <name>Waveform Generators</name>
+ <block>const_source_x</block>
+ <block>random_source_x</block>
</cat>
<cat>
<name>Variables</name>
@@ -257,27 +95,4 @@
<block>variable_function_probe</block>
<block>parameter</block>
</cat>
- <cat>
- <name>Misc</name>
- <block>note</block>
- <block>import</block>
-
- <block>gr_throttle</block>
- <block>gr_delay</block>
- <block>gr_repeat</block>
-
- <block>blks2_selector</block>
- <block>blks2_valve</block>
- <block>blks2_error_rate</block>
-
- <block>gr_head</block>
- <block>gr_skiphead</block>
-
- <block>gr_kludge_copy</block>
- <block>gr_copy</block>
- <block>gr_nop</block>
-
- <block>xmlrpc_server</block>
- <block>xmlrpc_client</block>
- </cat>
</cat>
diff --git a/grc/blocks/gr_add_const_vxx.xml b/grc/blocks/gr_add_const_vxx.xml
index 9f1c545ab8..360433cd7b 100644
--- a/grc/blocks/gr_add_const_vxx.xml
+++ b/grc/blocks/gr_add_const_vxx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Add Const</name>
+ <name>Add Const (old)</name>
<key>gr_add_const_vxx</key>
<import>from gnuradio import gr</import>
<make>gr.add_const_v$(type.fcn)($const)</make>
diff --git a/grc/blocks/gr_add_xx.xml b/grc/blocks/gr_add_xx.xml
index 97ed9283c2..14b8ad16a5 100644
--- a/grc/blocks/gr_add_xx.xml
+++ b/grc/blocks/gr_add_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Add</name>
+ <name>Add (old)</name>
<key>gr_add_xx</key>
<import>from gnuradio import gr</import>
<make>gr.add_v$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_additive_scrambler_bb.xml b/grc/blocks/gr_additive_scrambler_bb.xml
index a15d6eefbe..754303f881 100644
--- a/grc/blocks/gr_additive_scrambler_bb.xml
+++ b/grc/blocks/gr_additive_scrambler_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Additive Scrambler</name>
+ <name>Additive Scrambler (old)</name>
<key>gr_additive_scrambler_bb</key>
<import>from gnuradio import gr</import>
<make>gr.additive_scrambler_bb($mask, $seed, $len, $count)</make>
diff --git a/grc/blocks/gr_agc2_xx.xml b/grc/blocks/gr_agc2_xx.xml
index 55b20d4e82..54b0f80e8e 100644
--- a/grc/blocks/gr_agc2_xx.xml
+++ b/grc/blocks/gr_agc2_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>AGC2</name>
+ <name>AGC2 (old)</name>
<key>gr_agc2_xx</key>
<import>from gnuradio import gr</import>
<make>gr.agc2_$(type.fcn)($attack_rate, $decay_rate, $reference, $gain, $max_gain)</make>
diff --git a/grc/blocks/gr_agc_xx.xml b/grc/blocks/gr_agc_xx.xml
index c87d239edd..a63ce5890b 100644
--- a/grc/blocks/gr_agc_xx.xml
+++ b/grc/blocks/gr_agc_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>AGC</name>
+ <name>AGC (old)</name>
<key>gr_agc_xx</key>
<import>from gnuradio import gr</import>
<make>gr.agc_$(type.fcn)($rate, $reference, $gain, $max_gain)</make>
diff --git a/grc/blocks/gr_and_const_xx.xml b/grc/blocks/gr_and_const_xx.xml
index dc96493111..1e7e6a1c43 100644
--- a/grc/blocks/gr_and_const_xx.xml
+++ b/grc/blocks/gr_and_const_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>And Const</name>
+ <name>And Const (old)</name>
<key>gr_and_const_xx</key>
<import>from gnuradio import gr</import>
<make>gr.and_const_$(type.fcn)($const)</make>
diff --git a/grc/blocks/gr_and_xx.xml b/grc/blocks/gr_and_xx.xml
index 9ed0060906..ffeb872038 100644
--- a/grc/blocks/gr_and_xx.xml
+++ b/grc/blocks/gr_and_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>And</name>
+ <name>And (old)</name>
<key>gr_and_xx</key>
<import>from gnuradio import gr</import>
<make>gr.and_$(type.fcn)()</make>
diff --git a/grc/blocks/gr_argmax_xx.xml b/grc/blocks/gr_argmax_xx.xml
index 95269292e7..8c6a7ad7a9 100644
--- a/grc/blocks/gr_argmax_xx.xml
+++ b/grc/blocks/gr_argmax_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Argmax</name>
+ <name>Argmax (old)</name>
<key>gr_argmax_xx</key>
<import>from gnuradio import gr</import>
<make>gr.argmax_$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_burst_tagger.xml b/grc/blocks/gr_burst_tagger.xml
index 58c909999a..349b56ac9d 100644
--- a/grc/blocks/gr_burst_tagger.xml
+++ b/grc/blocks/gr_burst_tagger.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Burst Tagger</name>
+ <name>Burst Tagger (old)</name>
<key>gr_burst_tagger</key>
<import>from gnuradio import gr</import>
<make>gr.burst_tagger($type.size)
diff --git a/grc/blocks/gr_channel_model.xml b/grc/blocks/gr_channel_model.xml
index d0d178d345..d0d5889f56 100644
--- a/grc/blocks/gr_channel_model.xml
+++ b/grc/blocks/gr_channel_model.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Channel Model</name>
+ <name>Channel Model (old)</name>
<key>gr_channel_model</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_char_to_float.xml b/grc/blocks/gr_char_to_float.xml
index 838b6a203d..282fbd23b2 100644
--- a/grc/blocks/gr_char_to_float.xml
+++ b/grc/blocks/gr_char_to_float.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Char To Float</name>
+ <name>Char To Float (old)</name>
<key>gr_char_to_float</key>
<import>from gnuradio import gr</import>
<make>gr.char_to_float($vlen, $scale)</make>
diff --git a/grc/blocks/gr_char_to_short.xml b/grc/blocks/gr_char_to_short.xml
index 57261e0845..27b89b0780 100644
--- a/grc/blocks/gr_char_to_short.xml
+++ b/grc/blocks/gr_char_to_short.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Char To Short</name>
+ <name>Char To Short (old)</name>
<key>gr_char_to_short</key>
<import>from gnuradio import gr</import>
<make>gr.char_to_short($vlen)</make>
diff --git a/grc/blocks/gr_chunks_to_symbols.xml b/grc/blocks/gr_chunks_to_symbols.xml
index e9da38e9a5..60528f7cde 100644
--- a/grc/blocks/gr_chunks_to_symbols.xml
+++ b/grc/blocks/gr_chunks_to_symbols.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Chunks to Symbols</name>
+ <name>Chunks to Symbols (old)</name>
<key>gr_chunks_to_symbols_xx</key>
<import>from gnuradio import gr</import>
<make>gr.chunks_to_symbols_$(in_type.fcn)$(out_type.fcn)($symbol_table, $dimension)</make>
diff --git a/grc/blocks/gr_complex_to_arg.xml b/grc/blocks/gr_complex_to_arg.xml
index a7bbacd74f..e740ecd3e7 100644
--- a/grc/blocks/gr_complex_to_arg.xml
+++ b/grc/blocks/gr_complex_to_arg.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex to Arg</name>
+ <name>Complex to Arg (old)</name>
<key>gr_complex_to_arg</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_arg($vlen)</make>
diff --git a/grc/blocks/gr_complex_to_float.xml b/grc/blocks/gr_complex_to_float.xml
index 05681b0b90..4d9ae13610 100644
--- a/grc/blocks/gr_complex_to_float.xml
+++ b/grc/blocks/gr_complex_to_float.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Complex To Float</name>
+ <name>Complex To Float (old)</name>
<key>gr_complex_to_float</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_float($vlen)</make>
diff --git a/grc/blocks/gr_complex_to_imag.xml b/grc/blocks/gr_complex_to_imag.xml
index 7c120eedda..1ea5b2ce99 100644
--- a/grc/blocks/gr_complex_to_imag.xml
+++ b/grc/blocks/gr_complex_to_imag.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex to Imag</name>
+ <name>Complex to Imag (old)</name>
<key>gr_complex_to_imag</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_imag($vlen)</make>
diff --git a/grc/blocks/gr_complex_to_interleaved_short.xml b/grc/blocks/gr_complex_to_interleaved_short.xml
index 5e999599ac..28a503b8b0 100644
--- a/grc/blocks/gr_complex_to_interleaved_short.xml
+++ b/grc/blocks/gr_complex_to_interleaved_short.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex To IShort</name>
+ <name>Complex To IShort (old)</name>
<key>gr_complex_to_interleaved_short</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_interleaved_short()</make>
diff --git a/grc/blocks/gr_complex_to_mag.xml b/grc/blocks/gr_complex_to_mag.xml
index adc95f2075..d4308cf166 100644
--- a/grc/blocks/gr_complex_to_mag.xml
+++ b/grc/blocks/gr_complex_to_mag.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex to Mag</name>
+ <name>Complex to Mag (old)</name>
<key>gr_complex_to_mag</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_mag($vlen)</make>
diff --git a/grc/blocks/gr_complex_to_mag_squared.xml b/grc/blocks/gr_complex_to_mag_squared.xml
index cd23bfb5c5..ac8110bac9 100644
--- a/grc/blocks/gr_complex_to_mag_squared.xml
+++ b/grc/blocks/gr_complex_to_mag_squared.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex to Mag^2</name>
+ <name>Complex to Mag^2 (old)</name>
<key>gr_complex_to_mag_squared</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_mag_squared($vlen)</make>
diff --git a/grc/blocks/gr_complex_to_real.xml b/grc/blocks/gr_complex_to_real.xml
index ae9ec7b142..b0955516c6 100644
--- a/grc/blocks/gr_complex_to_real.xml
+++ b/grc/blocks/gr_complex_to_real.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex to Real</name>
+ <name>Complex to Real (old)</name>
<key>gr_complex_to_real</key>
<import>from gnuradio import gr</import>
<make>gr.complex_to_real($vlen)</make>
diff --git a/grc/blocks/gr_conjugate_cc.xml b/grc/blocks/gr_conjugate_cc.xml
index 0b4deb3472..0f7ded3c69 100644
--- a/grc/blocks/gr_conjugate_cc.xml
+++ b/grc/blocks/gr_conjugate_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Complex Conjugate</name>
+ <name>Complex Conjugate (old)</name>
<key>gr_conjugate_cc</key>
<import>from gnuradio import gr</import>
<make>gr.conjugate_cc()</make>
diff --git a/grc/blocks/gr_copy.xml b/grc/blocks/gr_copy.xml
index 8b12eaca78..fda3e14fca 100644
--- a/grc/blocks/gr_copy.xml
+++ b/grc/blocks/gr_copy.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Copy</name>
+ <name>Copy (old)</name>
<key>gr_copy</key>
<import>from gnuradio import gr</import>
<make>gr.copy($type.size*$vlen)
diff --git a/grc/blocks/gr_cpfsk_bc.xml b/grc/blocks/gr_cpfsk_bc.xml
index d5549d933f..d4692eaf98 100644
--- a/grc/blocks/gr_cpfsk_bc.xml
+++ b/grc/blocks/gr_cpfsk_bc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>CPFSK</name>
+ <name>CPFSK (old)</name>
<key>gr_cpfsk_bc</key>
<import>from gnuradio import gr</import>
<make>gr.cpfsk_bc($k, $amplitude, $samples_per_symbol)</make>
diff --git a/grc/blocks/gr_ctcss_squelch_ff.xml b/grc/blocks/gr_ctcss_squelch_ff.xml
index a34c75374c..d248c19993 100644
--- a/grc/blocks/gr_ctcss_squelch_ff.xml
+++ b/grc/blocks/gr_ctcss_squelch_ff.xml
@@ -27,7 +27,7 @@
###################################################
-->
<block>
- <name>CTCSS Squelch</name>
+ <name>CTCSS Squelch (old)</name>
<key>gr_ctcss_squelch_ff</key>
<import>from gnuradio import gr</import>
<make>gr.ctcss_squelch_ff($rate, $freq, $level, $len, $ramp, $gate)</make>
diff --git a/grc/blocks/gr_dc_blocker.xml b/grc/blocks/gr_dc_blocker.xml
index 05c3420747..a710c1ea08 100644
--- a/grc/blocks/gr_dc_blocker.xml
+++ b/grc/blocks/gr_dc_blocker.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>DC Blocker</name>
+ <name>DC Blocker (old)</name>
<key>gr_dc_blocker</key>
<import>from gnuradio import gr</import>
<make>gr.dc_blocker_$(type)($length, $long_form)</make>
diff --git a/grc/blocks/gr_deinterleave.xml b/grc/blocks/gr_deinterleave.xml
index a7482978c0..b600cf0262 100644
--- a/grc/blocks/gr_deinterleave.xml
+++ b/grc/blocks/gr_deinterleave.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Deinterleave</name>
+ <name>Deinterleave (old)</name>
<key>gr_deinterleave</key>
<import>from gnuradio import gr</import>
<make>gr.deinterleave($type.size*$vlen)</make>
diff --git a/grc/blocks/gr_delay.xml b/grc/blocks/gr_delay.xml
index 5cc411a782..fa6715df11 100644
--- a/grc/blocks/gr_delay.xml
+++ b/grc/blocks/gr_delay.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Delay</name>
+ <name>Delay (old)</name>
<key>gr_delay</key>
<import>from gnuradio import gr</import>
<make>gr.delay($type.size*$vlen, $delay)</make>
diff --git a/grc/blocks/gr_descrambler_bb.xml b/grc/blocks/gr_descrambler_bb.xml
index 5cfbcc203e..cd14b234df 100644
--- a/grc/blocks/gr_descrambler_bb.xml
+++ b/grc/blocks/gr_descrambler_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Descrambler</name>
+ <name>Descrambler (old)</name>
<key>gr_descrambler_bb</key>
<import>from gnuradio import gr</import>
<make>gr.descrambler_bb($mask, $seed, $len)</make>
diff --git a/grc/blocks/gr_diff_decoder_bb.xml b/grc/blocks/gr_diff_decoder_bb.xml
index ea7cf17343..bfb6e3e120 100644
--- a/grc/blocks/gr_diff_decoder_bb.xml
+++ b/grc/blocks/gr_diff_decoder_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Differential Decoder</name>
+ <name>Differential Decoder (old)</name>
<key>gr_diff_decoder_bb</key>
<import>from gnuradio import gr</import>
<make>gr.diff_decoder_bb($modulus)</make>
diff --git a/grc/blocks/gr_diff_encoder_bb.xml b/grc/blocks/gr_diff_encoder_bb.xml
index 21241eac22..b589f31361 100644
--- a/grc/blocks/gr_diff_encoder_bb.xml
+++ b/grc/blocks/gr_diff_encoder_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Differential Encoder</name>
+ <name>Differential Encoder (old)</name>
<key>gr_diff_encoder_bb</key>
<import>from gnuradio import gr</import>
<make>gr.diff_encoder_bb($modulus)</make>
diff --git a/grc/blocks/gr_diff_phasor_cc.xml b/grc/blocks/gr_diff_phasor_cc.xml
index 2b2d7e372c..d7a3445b6c 100644
--- a/grc/blocks/gr_diff_phasor_cc.xml
+++ b/grc/blocks/gr_diff_phasor_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Differential Phasor</name>
+ <name>Differential Phasor (old)</name>
<key>gr_diff_phasor_cc</key>
<import>from gnuradio import gr</import>
<make>gr.diff_phasor_cc()</make>
diff --git a/grc/blocks/gr_divide_xx.xml b/grc/blocks/gr_divide_xx.xml
index 04667bc2ac..5f95515e4b 100644
--- a/grc/blocks/gr_divide_xx.xml
+++ b/grc/blocks/gr_divide_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Divide</name>
+ <name>Divide (old)</name>
<key>gr_divide_xx</key>
<import>from gnuradio import gr</import>
<make>gr.divide_$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_dpll_bb.xml b/grc/blocks/gr_dpll_bb.xml
index 044d398ff1..add6e31930 100644
--- a/grc/blocks/gr_dpll_bb.xml
+++ b/grc/blocks/gr_dpll_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Detect Peak</name>
+ <name>Detect Peak (old)</name>
<key>gr_dpll_bb</key>
<import>from gnuradio import gr</import>
<make>gr.dpll_bb($period, $gain)</make>
diff --git a/grc/blocks/gr_endian_swap.xml b/grc/blocks/gr_endian_swap.xml
index aa564026cd..f826d42d44 100644
--- a/grc/blocks/gr_endian_swap.xml
+++ b/grc/blocks/gr_endian_swap.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Endian Swap</name>
+ <name>Endian Swap (old)</name>
<key>gr_endian_swap</key>
<import>from gnuradio import gr</import>
<make>gr.endian_swap($type.size)</make>
diff --git a/grc/blocks/gr_feedforward_agc_cc.xml b/grc/blocks/gr_feedforward_agc_cc.xml
index 24e80953f4..7af013cebb 100644
--- a/grc/blocks/gr_feedforward_agc_cc.xml
+++ b/grc/blocks/gr_feedforward_agc_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Feed Forward AGC</name>
+ <name>Feed Forward AGC (old)</name>
<key>gr_feedforward_agc_cc</key>
<import>from gnuradio import gr</import>
<make>gr.feedforward_agc_cc($num_samples, $reference)</make>
diff --git a/grc/blocks/gr_fft_filter_xxx.xml b/grc/blocks/gr_fft_filter_xxx.xml
index 5b4cd83cca..1147fc099d 100644
--- a/grc/blocks/gr_fft_filter_xxx.xml
+++ b/grc/blocks/gr_fft_filter_xxx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>FFT Filter</name>
+ <name>FFT Filter (old)</name>
<key>gr_fft_filter_xxx</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_fft_vxx.xml b/grc/blocks/gr_fft_vxx.xml
index 565354e415..3bf7b4f1e1 100644
--- a/grc/blocks/gr_fft_vxx.xml
+++ b/grc/blocks/gr_fft_vxx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>FFT</name>
+ <name>FFT (old)</name>
<key>gr_fft_vxx</key>
<import>from gnuradio import gr</import>
<import>from gnuradio import window</import>
diff --git a/grc/blocks/gr_file_sink.xml b/grc/blocks/gr_file_sink.xml
index d0a693900f..7399192f1d 100644
--- a/grc/blocks/gr_file_sink.xml
+++ b/grc/blocks/gr_file_sink.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>File Sink</name>
+ <name>File Sink (old)</name>
<key>gr_file_sink</key>
<import>from gnuradio import gr</import>
<make>gr.file_sink($type.size*$vlen, $file)
diff --git a/grc/blocks/gr_file_source.xml b/grc/blocks/gr_file_source.xml
index 5f0e16b279..0eb2b37b11 100644
--- a/grc/blocks/gr_file_source.xml
+++ b/grc/blocks/gr_file_source.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>File Source</name>
+ <name>File Source (old)</name>
<key>gr_file_source</key>
<import>from gnuradio import gr</import>
<make>gr.file_source($type.size*$vlen, $file, $repeat)</make>
diff --git a/grc/blocks/gr_filter_delay_fc.xml b/grc/blocks/gr_filter_delay_fc.xml
index 30d65bf825..731eaf395c 100644
--- a/grc/blocks/gr_filter_delay_fc.xml
+++ b/grc/blocks/gr_filter_delay_fc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Filter Delay</name>
+ <name>Filter Delay (old)</name>
<key>gr_filter_delay_fc</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_fir_filter_xxx.xml b/grc/blocks/gr_fir_filter_xxx.xml
index c4de8f539d..f2dad1dd46 100644
--- a/grc/blocks/gr_fir_filter_xxx.xml
+++ b/grc/blocks/gr_fir_filter_xxx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Decimating FIR Filter</name>
+ <name>Decimating FIR Filter (old)</name>
<key>gr_fir_filter_xxx</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_float_to_char.xml b/grc/blocks/gr_float_to_char.xml
index 1fa500e3cf..68b12f3847 100644
--- a/grc/blocks/gr_float_to_char.xml
+++ b/grc/blocks/gr_float_to_char.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Float To Char</name>
+ <name>Float To Char (old)</name>
<key>gr_float_to_char</key>
<import>from gnuradio import gr</import>
<make>gr.float_to_char($vlen, $scale)</make>
diff --git a/grc/blocks/gr_float_to_complex.xml b/grc/blocks/gr_float_to_complex.xml
index a42cff3589..30bc1cd379 100644
--- a/grc/blocks/gr_float_to_complex.xml
+++ b/grc/blocks/gr_float_to_complex.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Float To Complex</name>
+ <name>Float To Complex (old)</name>
<key>gr_float_to_complex</key>
<import>from gnuradio import gr</import>
<make>gr.float_to_complex($vlen)</make>
diff --git a/grc/blocks/gr_float_to_int.xml b/grc/blocks/gr_float_to_int.xml
index b43c208a5a..3999cab6a7 100644
--- a/grc/blocks/gr_float_to_int.xml
+++ b/grc/blocks/gr_float_to_int.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Float To Int</name>
+ <name>Float To Int (old)</name>
<key>gr_float_to_int</key>
<import>from gnuradio import gr</import>
<make>gr.float_to_int($vlen, $scale)</make>
diff --git a/grc/blocks/gr_float_to_short.xml b/grc/blocks/gr_float_to_short.xml
index 4f76b8f580..14e4dd2cb3 100644
--- a/grc/blocks/gr_float_to_short.xml
+++ b/grc/blocks/gr_float_to_short.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Float To Short</name>
+ <name>Float To Short (old)</name>
<key>gr_float_to_short</key>
<import>from gnuradio import gr</import>
<make>gr.float_to_short($vlen, $scale)</make>
diff --git a/grc/blocks/gr_float_to_uchar.xml b/grc/blocks/gr_float_to_uchar.xml
index aa804d7d93..0ff345f0d3 100644
--- a/grc/blocks/gr_float_to_uchar.xml
+++ b/grc/blocks/gr_float_to_uchar.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Float To UChar</name>
+ <name>Float To UChar (old)</name>
<key>gr_float_to_uchar</key>
<import>from gnuradio import gr</import>
<make>gr.float_to_uchar()</make>
diff --git a/grc/blocks/gr_fractional_interpolator_xx.xml b/grc/blocks/gr_fractional_interpolator_xx.xml
index 8d65ff8bfc..022dcc6a69 100644
--- a/grc/blocks/gr_fractional_interpolator_xx.xml
+++ b/grc/blocks/gr_fractional_interpolator_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Fractional Interpolator</name>
+ <name>Fractional Interpolator (old)</name>
<key>gr_fractional_interpolator_xx</key>
<import>from gnuradio import gr</import>
<make>gr.fractional_interpolator_$(type.fcn)($phase_shift, $interp_ratio)</make>
diff --git a/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml b/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml
index e3ee66977d..ddbc69ec0d 100644
--- a/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml
+++ b/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Frequency Xlating FIR Filter</name>
+ <name>Frequency Xlating FIR Filter (old)</name>
<key>gr_freq_xlating_fir_filter_xxx</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_frequency_modulator_fc.xml b/grc/blocks/gr_frequency_modulator_fc.xml
index d5f8fcfe35..d8da95b29f 100644
--- a/grc/blocks/gr_frequency_modulator_fc.xml
+++ b/grc/blocks/gr_frequency_modulator_fc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Frequency Mod</name>
+ <name>Frequency Mod (old)</name>
<key>gr_frequency_modulator_fc</key>
<import>from gnuradio import gr</import>
<make>gr.frequency_modulator_fc($sensitivity)</make>
diff --git a/grc/blocks/gr_glfsr_source_x.xml b/grc/blocks/gr_glfsr_source_x.xml
index 88fb66797b..4aa4b5d774 100644
--- a/grc/blocks/gr_glfsr_source_x.xml
+++ b/grc/blocks/gr_glfsr_source_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>GLFSR Source</name>
+ <name>GLFSR Source (old)</name>
<key>gr_glfsr_source_x</key>
<import>from gnuradio import gr</import>
<make>gr.glfsr_source_$(type.fcn)($degree, $repeat, $mask, $seed)</make>
diff --git a/grc/blocks/gr_goertzel_fc.xml b/grc/blocks/gr_goertzel_fc.xml
index f27d9582ea..5907bd0304 100644
--- a/grc/blocks/gr_goertzel_fc.xml
+++ b/grc/blocks/gr_goertzel_fc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Goertzel</name>
+ <name>Goertzel (old)</name>
<key>gr_goertzel_fc</key>
<import>from gnuradio import gr</import>
<make>gr.goertzel_fc($rate, $len, $freq)</make>
diff --git a/grc/blocks/gr_head.xml b/grc/blocks/gr_head.xml
index e5ff7f6aad..cb93071676 100644
--- a/grc/blocks/gr_head.xml
+++ b/grc/blocks/gr_head.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Head</name>
+ <name>Head (old)</name>
<key>gr_head</key>
<import>from gnuradio import gr</import>
<make>gr.head($type.size*$vlen, $num_items)</make>
diff --git a/grc/blocks/gr_hilbert_fc.xml b/grc/blocks/gr_hilbert_fc.xml
index 165e8da237..08dbe6386f 100644
--- a/grc/blocks/gr_hilbert_fc.xml
+++ b/grc/blocks/gr_hilbert_fc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Hilbert</name>
+ <name>Hilbert (old)</name>
<key>gr_hilbert_fc</key>
<import>from gnuradio import gr</import>
<make>gr.hilbert_fc($num_taps)</make>
diff --git a/grc/blocks/gr_iir_filter_ffd.xml b/grc/blocks/gr_iir_filter_ffd.xml
index 9799150e80..ffad5be165 100644
--- a/grc/blocks/gr_iir_filter_ffd.xml
+++ b/grc/blocks/gr_iir_filter_ffd.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>IIR Filter</name>
+ <name>IIR Filter (old)</name>
<key>gr_iir_filter_ffd</key>
<import>from gnuradio import gr</import>
<make>gr.iir_filter_ffd($fftaps, $fbtaps)</make>
diff --git a/grc/blocks/gr_int_to_float.xml b/grc/blocks/gr_int_to_float.xml
index 7430fec728..3a68282c40 100644
--- a/grc/blocks/gr_int_to_float.xml
+++ b/grc/blocks/gr_int_to_float.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Int To Float</name>
+ <name>Int To Float (old)</name>
<key>gr_int_to_float</key>
<import>from gnuradio import gr</import>
<make>gr.int_to_float($vlen, $scale)</make>
diff --git a/grc/blocks/gr_integrate_xx.xml b/grc/blocks/gr_integrate_xx.xml
index d0ebd42e2d..e3adb1d976 100644
--- a/grc/blocks/gr_integrate_xx.xml
+++ b/grc/blocks/gr_integrate_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Integrate</name>
+ <name>Integrate (old)</name>
<key>gr_integrate_xx</key>
<import>from gnuradio import gr</import>
<make>gr.integrate_$(type.fcn)($decim)</make>
diff --git a/grc/blocks/gr_interleave.xml b/grc/blocks/gr_interleave.xml
index 3db16ab552..6d3920d685 100644
--- a/grc/blocks/gr_interleave.xml
+++ b/grc/blocks/gr_interleave.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Interleave</name>
+ <name>Interleave (old)</name>
<key>gr_interleave</key>
<import>from gnuradio import gr</import>
<make>gr.interleave($type.size*$vlen)</make>
diff --git a/grc/blocks/gr_interleaved_short_to_complex.xml b/grc/blocks/gr_interleaved_short_to_complex.xml
index e3023e499d..edfe82f120 100644
--- a/grc/blocks/gr_interleaved_short_to_complex.xml
+++ b/grc/blocks/gr_interleaved_short_to_complex.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>IShort To Complex</name>
+ <name>IShort To Complex (old)</name>
<key>gr_interleaved_short_to_complex</key>
<import>from gnuradio import gr</import>
<make>gr.interleaved_short_to_complex()</make>
diff --git a/grc/blocks/gr_interp_fir_filter_xxx.xml b/grc/blocks/gr_interp_fir_filter_xxx.xml
index 55375ae021..66046d6081 100644
--- a/grc/blocks/gr_interp_fir_filter_xxx.xml
+++ b/grc/blocks/gr_interp_fir_filter_xxx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Interpolating FIR Filter</name>
+ <name>Interpolating FIR Filter (old)</name>
<key>gr_interp_fir_filter_xxx</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_keep_m_in_n.xml b/grc/blocks/gr_keep_m_in_n.xml
index 35a1561764..34717cf5dc 100644
--- a/grc/blocks/gr_keep_m_in_n.xml
+++ b/grc/blocks/gr_keep_m_in_n.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Keep M in N</name>
+ <name>Keep M in N (old)</name>
<key>gr_keep_m_in_n</key>
<import>from gnuradio import gr</import>
<make>gr.keep_m_in_n($type.size, $m, $n, $offset)</make>
diff --git a/grc/blocks/gr_keep_one_in_n.xml b/grc/blocks/gr_keep_one_in_n.xml
index 21595b7559..dc382c30ef 100644
--- a/grc/blocks/gr_keep_one_in_n.xml
+++ b/grc/blocks/gr_keep_one_in_n.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Keep 1 in N</name>
+ <name>Keep 1 in N (old)</name>
<key>gr_keep_one_in_n</key>
<import>from gnuradio import gr</import>
<make>gr.keep_one_in_n($type.size*$vlen, $n)</make>
diff --git a/grc/blocks/gr_kludge_copy.xml b/grc/blocks/gr_kludge_copy.xml
index 8058b082db..fca60fcca0 100644
--- a/grc/blocks/gr_kludge_copy.xml
+++ b/grc/blocks/gr_kludge_copy.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Kludge Copy</name>
+ <name>Kludge Copy (old)</name>
<key>gr_kludge_copy</key>
<import>from gnuradio import gr</import>
<make>gr.kludge_copy($type.size*$vlen)</make>
diff --git a/grc/blocks/gr_map_bb.xml b/grc/blocks/gr_map_bb.xml
index 20d6bd2b44..a9964bff34 100644
--- a/grc/blocks/gr_map_bb.xml
+++ b/grc/blocks/gr_map_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Map</name>
+ <name>Map (old)</name>
<key>gr_map_bb</key>
<import>from gnuradio import gr</import>
<make>gr.map_bb($map)</make>
diff --git a/grc/blocks/gr_max_xx.xml b/grc/blocks/gr_max_xx.xml
index 9dbbe60e56..5718e8b5ba 100644
--- a/grc/blocks/gr_max_xx.xml
+++ b/grc/blocks/gr_max_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Max</name>
+ <name>Max (old)</name>
<key>gr_max_xx</key>
<import>from gnuradio import gr</import>
<make>gr.max_$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_message_burst_source.xml b/grc/blocks/gr_message_burst_source.xml
index e835d2a2ce..0ec3adee14 100644
--- a/grc/blocks/gr_message_burst_source.xml
+++ b/grc/blocks/gr_message_burst_source.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Message Burst Source</name>
+ <name>Message Burst Source (old)</name>
<key>gr_message_burst_source</key>
<import>from gnuradio import gr</import>
<make>gr.message_burst_source($type.size*$vlen, $(id)_msgq_in)</make>
diff --git a/grc/blocks/gr_message_debug.xml b/grc/blocks/gr_message_debug.xml
index 964f957569..5aec5d0683 100644
--- a/grc/blocks/gr_message_debug.xml
+++ b/grc/blocks/gr_message_debug.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Message Debug</name>
+ <name>Message Debug (old)</name>
<key>gr_message_debug</key>
<import>from gnuradio import gr</import>
<make>gr.message_debug()</make>
diff --git a/grc/blocks/gr_message_sink.xml b/grc/blocks/gr_message_sink.xml
index 18e92adb97..3929d5a66d 100644
--- a/grc/blocks/gr_message_sink.xml
+++ b/grc/blocks/gr_message_sink.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Message Sink</name>
+ <name>Message Sink (old)</name>
<key>gr_message_sink</key>
<import>from gnuradio import gr</import>
<make>gr.message_sink($type.size*$vlen, $(id)_msgq_out, $dont_block)</make>
diff --git a/grc/blocks/gr_message_source.xml b/grc/blocks/gr_message_source.xml
index 72367b21b0..b54e83c1c2 100644
--- a/grc/blocks/gr_message_source.xml
+++ b/grc/blocks/gr_message_source.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Message Source</name>
+ <name>Message Source (old)</name>
<key>gr_message_source</key>
<import>from gnuradio import gr</import>
<make>gr.message_source($type.size*$vlen, $(id)_msgq_in)</make>
diff --git a/grc/blocks/gr_message_strobe.xml b/grc/blocks/gr_message_strobe.xml
index 60a7724dfc..596f84d8ba 100644
--- a/grc/blocks/gr_message_strobe.xml
+++ b/grc/blocks/gr_message_strobe.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Message Strobe</name>
+ <name>Message Strobe (old)</name>
<key>gr_message_strobe</key>
<import>from gnuradio import gr</import>
<import>from gruel import pmt</import>
diff --git a/grc/blocks/gr_moving_average_xx.xml b/grc/blocks/gr_moving_average_xx.xml
index b70943c785..6334f53c56 100644
--- a/grc/blocks/gr_moving_average_xx.xml
+++ b/grc/blocks/gr_moving_average_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Moving Average</name>
+ <name>Moving Average (old)</name>
<key>gr_moving_average_xx</key>
<import>from gnuradio import gr</import>
<make>gr.moving_average_$(type.fcn)($length, $scale, $max_iter)</make>
diff --git a/grc/blocks/gr_mpsk_sync_cc.xml b/grc/blocks/gr_mpsk_sync_cc.xml
deleted file mode 100644
index fd08f8340b..0000000000
--- a/grc/blocks/gr_mpsk_sync_cc.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##MPSK Sync
-###################################################
- -->
-<block>
- <name>MPSK Sync</name>
- <key>gr_mpsk_sync_cc</key>
- <import>from gnuradio import gr</import>
- <make>gr.mpsk_sync_cc($alpha, $beta, $max_freq, $min_freq, $ref_phase, $omega, $gain_omega, $mu, $gain_mu)</make>
- <callback>set_mu($mu)</callback>
- <callback>set_gain_mu($gain_mu)</callback>
- <callback>set_omega($omega)</callback>
- <callback>set_gain_omega($gain_omega)</callback>
- <param>
- <name>Alpha</name>
- <key>alpha</key>
- <type>real</type>
- </param>
- <param>
- <name>Beta</name>
- <key>beta</key>
- <type>real</type>
- </param>
- <param>
- <name>Max Freq</name>
- <key>max_freq</key>
- <type>real</type>
- </param>
- <param>
- <name>Min Freq</name>
- <key>min_freq</key>
- <type>real</type>
- </param>
- <param>
- <name>Reference Phase</name>
- <key>ref_phase</key>
- <type>real</type>
- </param>
- <param>
- <name>Omega</name>
- <key>omega</key>
- <type>real</type>
- </param>
- <param>
- <name>Gain Omega</name>
- <key>gain_omega</key>
- <type>real</type>
- </param>
- <param>
- <name>Mu</name>
- <key>mu</key>
- <type>real</type>
- </param>
- <param>
- <name>Gain Mu</name>
- <key>gain_mu</key>
- <type>real</type>
- </param>
- <sink>
- <name>in</name>
- <type>complex</type>
- </sink>
- <source>
- <name>out</name>
- <type>complex</type>
- </source>
-</block>
diff --git a/grc/blocks/gr_multiply_const_vxx.xml b/grc/blocks/gr_multiply_const_vxx.xml
index 1309d75cde..98c69fa31a 100644
--- a/grc/blocks/gr_multiply_const_vxx.xml
+++ b/grc/blocks/gr_multiply_const_vxx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Multiply Const</name>
+ <name>Multiply Const (old)</name>
<key>gr_multiply_const_vxx</key>
<import>from gnuradio import gr</import>
<make>gr.multiply_const_v$(type.fcn)($const)</make>
diff --git a/grc/blocks/gr_multiply_xx.xml b/grc/blocks/gr_multiply_xx.xml
index 60f65c2745..4ff9e1c5ef 100644
--- a/grc/blocks/gr_multiply_xx.xml
+++ b/grc/blocks/gr_multiply_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Multiply</name>
+ <name>Multiply (old)</name>
<key>gr_multiply_xx</key>
<import>from gnuradio import gr</import>
<make>gr.multiply_v$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_mute_xx.xml b/grc/blocks/gr_mute_xx.xml
index a9a857c6a1..0ca593b854 100644
--- a/grc/blocks/gr_mute_xx.xml
+++ b/grc/blocks/gr_mute_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Mute</name>
+ <name>Mute (old)</name>
<key>gr_mute_xx</key>
<import>from gnuradio import gr</import>
<make>gr.mute_$(type.fcn)(bool($mute))</make>
diff --git a/grc/blocks/gr_nlog10_ff.xml b/grc/blocks/gr_nlog10_ff.xml
index 9350782368..4d4efe4ce9 100644
--- a/grc/blocks/gr_nlog10_ff.xml
+++ b/grc/blocks/gr_nlog10_ff.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Log10</name>
+ <name>Log10 (old)</name>
<key>gr_nlog10_ff</key>
<import>from gnuradio import gr</import>
<make>gr.nlog10_ff($n, $vlen, $k)</make>
diff --git a/grc/blocks/gr_noise_source_x.xml b/grc/blocks/gr_noise_source_x.xml
index 72daaaa209..c37127977b 100644
--- a/grc/blocks/gr_noise_source_x.xml
+++ b/grc/blocks/gr_noise_source_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Noise Source</name>
+ <name>Noise Source (old)</name>
<key>gr_noise_source_x</key>
<import>from gnuradio import gr</import>
<make>gr.noise_source_$(type.fcn)($noise_type, $amp, $seed)</make>
diff --git a/grc/blocks/gr_nop.xml b/grc/blocks/gr_nop.xml
index bd884d6b8b..65f24b0ade 100644
--- a/grc/blocks/gr_nop.xml
+++ b/grc/blocks/gr_nop.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Nop</name>
+ <name>Nop (old)</name>
<key>gr_nop</key>
<import>from gnuradio import gr</import>
<make>gr.nop($type.size*$vlen)</make>
diff --git a/grc/blocks/gr_not_xx.xml b/grc/blocks/gr_not_xx.xml
index 1c2bb87096..0dcbbf8e6c 100644
--- a/grc/blocks/gr_not_xx.xml
+++ b/grc/blocks/gr_not_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Not</name>
+ <name>Not (old)</name>
<key>gr_not_xx</key>
<import>from gnuradio import gr</import>
<make>gr.not_$(type.fcn)()</make>
diff --git a/grc/blocks/gr_null_sink.xml b/grc/blocks/gr_null_sink.xml
index ed106b4950..497f3a85ab 100644
--- a/grc/blocks/gr_null_sink.xml
+++ b/grc/blocks/gr_null_sink.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Null Sink</name>
+ <name>Null Sink (old)</name>
<key>gr_null_sink</key>
<import>from gnuradio import gr</import>
<make>gr.null_sink($type.size*$vlen)</make>
diff --git a/grc/blocks/gr_null_source.xml b/grc/blocks/gr_null_source.xml
index 6132eae3cb..42d5b2edbb 100644
--- a/grc/blocks/gr_null_source.xml
+++ b/grc/blocks/gr_null_source.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Null Source</name>
+ <name>Null Source (old)</name>
<key>gr_null_source</key>
<import>from gnuradio import gr</import>
<make>gr.null_source($type.size*$vlen)</make>
diff --git a/grc/blocks/gr_or_xx.xml b/grc/blocks/gr_or_xx.xml
index b374aa22ab..4d29dc1495 100644
--- a/grc/blocks/gr_or_xx.xml
+++ b/grc/blocks/gr_or_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Or</name>
+ <name>Or (old)</name>
<key>gr_or_xx</key>
<import>from gnuradio import gr</import>
<make>gr.or_$(type.fcn)()</make>
diff --git a/grc/blocks/gr_pack_k_bits_bb.xml b/grc/blocks/gr_pack_k_bits_bb.xml
index 34e64a5d96..958e308c6a 100644
--- a/grc/blocks/gr_pack_k_bits_bb.xml
+++ b/grc/blocks/gr_pack_k_bits_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Pack K Bits</name>
+ <name>Pack K Bits (old)</name>
<key>gr_pack_k_bits_bb</key>
<import>from gnuradio import gr</import>
<make>gr.pack_k_bits_bb($k)</make>
diff --git a/grc/blocks/gr_packed_to_unpacked_xx.xml b/grc/blocks/gr_packed_to_unpacked_xx.xml
index c1477dd9ca..ffba71cce3 100644
--- a/grc/blocks/gr_packed_to_unpacked_xx.xml
+++ b/grc/blocks/gr_packed_to_unpacked_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Packed to Unpacked</name>
+ <name>Packed to Unpacked (old)</name>
<key>gr_packed_to_unpacked_xx</key>
<import>from gnuradio import gr</import>
<make>gr.packed_to_unpacked_$(type.fcn)($bits_per_chunk, $endianness)</make>
diff --git a/grc/blocks/gr_pdu_to_tagged_stream.xml b/grc/blocks/gr_pdu_to_tagged_stream.xml
index 6d2fea97e7..2d4a517129 100644
--- a/grc/blocks/gr_pdu_to_tagged_stream.xml
+++ b/grc/blocks/gr_pdu_to_tagged_stream.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>PDU to Tagged Stream</name>
+ <name>PDU to Tagged Stream (old)</name>
<key>gr_pdu_to_tagged_stream</key>
<import>from gnuradio import gr</import>
<make>gr.pdu_to_tagged_stream($type.tv)</make>
diff --git a/grc/blocks/gr_peak_detector2_fb.xml b/grc/blocks/gr_peak_detector2_fb.xml
index 128c6244f7..998d97a9d2 100644
--- a/grc/blocks/gr_peak_detector2_fb.xml
+++ b/grc/blocks/gr_peak_detector2_fb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Peak Detector2</name>
+ <name>Peak Detector2 (old)</name>
<key>gr_peak_detector2_fb</key>
<import>from gnuradio import gr</import>
<make>gr.peak_detector2_fb($threshold_factor_rise, $look_ahead, $alpha)</make>
diff --git a/grc/blocks/gr_peak_detector_xb.xml b/grc/blocks/gr_peak_detector_xb.xml
index 394b0697f8..a789b372b9 100644
--- a/grc/blocks/gr_peak_detector_xb.xml
+++ b/grc/blocks/gr_peak_detector_xb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Peak Detector</name>
+ <name>Peak Detector (old)</name>
<key>gr_peak_detector_xb</key>
<import>from gnuradio import gr</import>
<make>gr.peak_detector_$(type.fcn)b($threshold_factor_rise, $threshold_factor_fall, $look_ahead, $alpha)</make>
diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
index 3e5e65d127..d469e065d6 100644
--- a/grc/blocks/gr_pfb_clock_sync.xml
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Polyphase Clock Sync</name>
+ <name>Polyphase Clock Sync (old)</name>
<key>gr_pfb_clock_sync_xxx</key>
<import>from gnuradio import gr</import>
<make>gr.pfb_clock_sync_$(type)($sps, $alpha, $taps, $filter_size, $init_phase, $max_dev, $osps)
diff --git a/grc/blocks/gr_pfb_synthesizer.xml b/grc/blocks/gr_pfb_synthesizer.xml
index 49e5cb0321..b78d345586 100644
--- a/grc/blocks/gr_pfb_synthesizer.xml
+++ b/grc/blocks/gr_pfb_synthesizer.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Polyphase Synthesizer</name>
+ <name>Polyphase Synthesizer (old)</name>
<key>gr_pfb_synthesizer_ccf</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_phase_modulator_fc.xml b/grc/blocks/gr_phase_modulator_fc.xml
index 758c50863b..bcde45a635 100644
--- a/grc/blocks/gr_phase_modulator_fc.xml
+++ b/grc/blocks/gr_phase_modulator_fc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Phase Mod</name>
+ <name>Phase Mod (old)</name>
<key>gr_phase_modulator_fc</key>
<import>from gnuradio import gr</import>
<make>gr.phase_modulator_fc($sensitivity)</make>
diff --git a/grc/blocks/gr_pll_carriertracking_cc.xml b/grc/blocks/gr_pll_carriertracking_cc.xml
index 27e6732482..cb90b197d6 100644
--- a/grc/blocks/gr_pll_carriertracking_cc.xml
+++ b/grc/blocks/gr_pll_carriertracking_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>PLL Carrier Tracking</name>
+ <name>PLL Carrier Tracking (old)</name>
<key>gr_pll_carriertracking_cc</key>
<import>from gnuradio import gr</import>
<make>gr.pll_carriertracking_cc($w, $max_freq, $min_freq)</make>
diff --git a/grc/blocks/gr_pll_freqdet_cf.xml b/grc/blocks/gr_pll_freqdet_cf.xml
index d6e4694f00..b73cd6ff10 100644
--- a/grc/blocks/gr_pll_freqdet_cf.xml
+++ b/grc/blocks/gr_pll_freqdet_cf.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>PLL Freq Det</name>
+ <name>PLL Freq Det (old)</name>
<key>gr_pll_freqdet_cf</key>
<import>from gnuradio import gr</import>
<make>gr.pll_freqdet_cf($w, $max_freq, $min_freq)</make>
diff --git a/grc/blocks/gr_pll_refout_cc.xml b/grc/blocks/gr_pll_refout_cc.xml
index b231ddd19a..a92bf2c3ed 100644
--- a/grc/blocks/gr_pll_refout_cc.xml
+++ b/grc/blocks/gr_pll_refout_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>PLL Ref Out</name>
+ <name>PLL Ref Out (old)</name>
<key>gr_pll_refout_cc</key>
<import>from gnuradio import gr</import>
<make>gr.pll_refout_cc($w, $max_freq, $min_freq)</make>
diff --git a/grc/blocks/gr_pn_correlator_cc.xml b/grc/blocks/gr_pn_correlator_cc.xml
index 094f46cdfd..54d512a28b 100644
--- a/grc/blocks/gr_pn_correlator_cc.xml
+++ b/grc/blocks/gr_pn_correlator_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>PN Correlator</name>
+ <name>PN Correlator (old)</name>
<key>gr_pn_correlator_cc</key>
<import>from gnuradio import gr</import>
<make>gr.pn_correlator_cc($degree, $mask, $seed)</make>
diff --git a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml
index 6bf706ae1c..65fd0e763b 100644
--- a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml
+++ b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Probe Avg Mag^2</name>
+ <name>Probe Avg Mag^2 (old)</name>
<key>gr_probe_avg_mag_sqrd_x</key>
<import>from gnuradio import gr</import>
<make>gr.probe_avg_mag_sqrd_$(type)($threshold, $alpha)</make>
diff --git a/grc/blocks/gr_probe_density_b.xml b/grc/blocks/gr_probe_density_b.xml
index 3a91256aa5..84dec814a5 100644
--- a/grc/blocks/gr_probe_density_b.xml
+++ b/grc/blocks/gr_probe_density_b.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Probe Density</name>
+ <name>Probe Density (old)</name>
<key>gr_probe_density_b</key>
<import>from gnuradio import gr</import>
<make>gr.probe_density_b($alpha)</make>
diff --git a/grc/blocks/gr_probe_signal_f.xml b/grc/blocks/gr_probe_signal_f.xml
index 5c38e816f0..731da6f49b 100644
--- a/grc/blocks/gr_probe_signal_f.xml
+++ b/grc/blocks/gr_probe_signal_f.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Probe Signal</name>
+ <name>Probe Signal (old)</name>
<key>gr_probe_signal_f</key>
<import>from gnuradio import gr</import>
<make>gr.probe_signal_f()</make>
diff --git a/grc/blocks/gr_pwr_squelch_xx.xml b/grc/blocks/gr_pwr_squelch_xx.xml
index 08d6211770..12bd337ebd 100644
--- a/grc/blocks/gr_pwr_squelch_xx.xml
+++ b/grc/blocks/gr_pwr_squelch_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Power Squelch</name>
+ <name>Power Squelch (old)</name>
<key>gr_pwr_squelch_xx</key>
<import>from gnuradio import gr</import>
<make>gr.pwr_squelch_$(type.fcn)($threshold, $alpha, $ramp, $gate)</make>
diff --git a/grc/blocks/gr_quadrature_demod_cf.xml b/grc/blocks/gr_quadrature_demod_cf.xml
index fad0b3879c..ed0f326a4b 100644
--- a/grc/blocks/gr_quadrature_demod_cf.xml
+++ b/grc/blocks/gr_quadrature_demod_cf.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Quadrature Demod</name>
+ <name>Quadrature Demod (old)</name>
<key>gr_quadrature_demod_cf</key>
<import>from gnuradio import gr</import>
<make>gr.quadrature_demod_cf($gain)</make>
diff --git a/grc/blocks/gr_rational_resampler_base_xxx.xml b/grc/blocks/gr_rational_resampler_base_xxx.xml
index 4b7720173c..7bdf0577e0 100644
--- a/grc/blocks/gr_rational_resampler_base_xxx.xml
+++ b/grc/blocks/gr_rational_resampler_base_xxx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Rational Resampler Base</name>
+ <name>Rational Resampler Base (old)</name>
<key>gr_rational_resampler_base_xxx</key>
<import>from gnuradio import gr</import>
<import>from gnuradio.gr import firdes</import>
diff --git a/grc/blocks/gr_repeat.xml b/grc/blocks/gr_repeat.xml
index ba652a4d79..6555e391fa 100644
--- a/grc/blocks/gr_repeat.xml
+++ b/grc/blocks/gr_repeat.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Repeat</name>
+ <name>Repeat (old)</name>
<key>gr_repeat</key>
<import>from gnuradio import gr</import>
<make>gr.repeat($type.size*$vlen, $interp)</make>
diff --git a/grc/blocks/gr_rms_xx.xml b/grc/blocks/gr_rms_xx.xml
index 1e0947192b..e878871e8e 100644
--- a/grc/blocks/gr_rms_xx.xml
+++ b/grc/blocks/gr_rms_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>RMS</name>
+ <name>RMS (old)</name>
<key>gr_rms_xx</key>
<import>from gnuradio import gr</import>
<make>gr.rms_$(type.fcn)f($alpha)</make>
diff --git a/grc/blocks/gr_sample_and_hold_xx.xml b/grc/blocks/gr_sample_and_hold_xx.xml
index 2a036c3fdb..82400cf84e 100644
--- a/grc/blocks/gr_sample_and_hold_xx.xml
+++ b/grc/blocks/gr_sample_and_hold_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Sample and Hold</name>
+ <name>Sample and Hold (old)</name>
<key>gr_sample_and_hold_xx</key>
<import>from gnuradio import gr</import>
<make>gr.sample_and_hold_$(type.fcn)()</make>
diff --git a/grc/blocks/gr_scrambler_bb.xml b/grc/blocks/gr_scrambler_bb.xml
index d079c4015f..17270eafc1 100644
--- a/grc/blocks/gr_scrambler_bb.xml
+++ b/grc/blocks/gr_scrambler_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Scrambler</name>
+ <name>Scrambler (old)</name>
<key>gr_scrambler_bb</key>
<import>from gnuradio import gr</import>
<make>gr.scrambler_bb($mask, $seed, $len)</make>
diff --git a/grc/blocks/gr_short_to_char.xml b/grc/blocks/gr_short_to_char.xml
index 9c41da84ef..2021eaf838 100644
--- a/grc/blocks/gr_short_to_char.xml
+++ b/grc/blocks/gr_short_to_char.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Short To Char</name>
+ <name>Short To Char (old)</name>
<key>gr_short_to_char</key>
<import>from gnuradio import gr</import>
<make>gr.short_to_char($vlen)</make>
diff --git a/grc/blocks/gr_short_to_float.xml b/grc/blocks/gr_short_to_float.xml
index 529f8c78cb..bf3657b638 100644
--- a/grc/blocks/gr_short_to_float.xml
+++ b/grc/blocks/gr_short_to_float.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Short To Float</name>
+ <name>Short To Float (old)</name>
<key>gr_short_to_float</key>
<import>from gnuradio import gr</import>
<make>gr.short_to_float($vlen, $scale)</make>
diff --git a/grc/blocks/gr_sig_source_x.xml b/grc/blocks/gr_sig_source_x.xml
index 644cf52d0c..fcb36b9a1c 100644
--- a/grc/blocks/gr_sig_source_x.xml
+++ b/grc/blocks/gr_sig_source_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Signal Source</name>
+ <name>Signal Source (old)</name>
<key>gr_sig_source_x</key>
<import>from gnuradio import gr</import>
<make>gr.sig_source_$(type.fcn)($samp_rate, $waveform, $freq, $amp, $offset)</make>
diff --git a/grc/blocks/gr_simple_correlator.xml b/grc/blocks/gr_simple_correlator.xml
index 820523a644..c6c076b8be 100644
--- a/grc/blocks/gr_simple_correlator.xml
+++ b/grc/blocks/gr_simple_correlator.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Simple Correlator</name>
+ <name>Simple Correlator (old)</name>
<key>gr_simple_correlator</key>
<import>from gnuradio import gr</import>
<make>gr.simple_correlator($payload_bytesize)</make>
diff --git a/grc/blocks/gr_simple_framer.xml b/grc/blocks/gr_simple_framer.xml
index 2a0295c417..aa194d7ab2 100644
--- a/grc/blocks/gr_simple_framer.xml
+++ b/grc/blocks/gr_simple_framer.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Simple Framer</name>
+ <name>Simple Framer (old)</name>
<key>gr_simple_framer</key>
<import>from gnuradio import gr</import>
<make>gr.simple_framer($payload_bytesize)</make>
diff --git a/grc/blocks/gr_simple_squelch_cc.xml b/grc/blocks/gr_simple_squelch_cc.xml
index 5c0727f5f8..1be4b662e6 100644
--- a/grc/blocks/gr_simple_squelch_cc.xml
+++ b/grc/blocks/gr_simple_squelch_cc.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Simple Squelch</name>
+ <name>Simple Squelch (old)</name>
<key>gr_simple_squelch_cc</key>
<import>from gnuradio import gr</import>
<make>gr.simple_squelch_cc($threshold, $alpha)</make>
diff --git a/grc/blocks/gr_single_pole_iir_filter_xx.xml b/grc/blocks/gr_single_pole_iir_filter_xx.xml
index 50cf4a82d8..8d8b455a46 100644
--- a/grc/blocks/gr_single_pole_iir_filter_xx.xml
+++ b/grc/blocks/gr_single_pole_iir_filter_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Single Pole IIR Filter</name>
+ <name>Single Pole IIR Filter (old)</name>
<key>gr_single_pole_iir_filter_xx</key>
<import>from gnuradio import gr</import>
<make>gr.single_pole_iir_filter_$(type.fcn)($alpha, $vlen)</make>
diff --git a/grc/blocks/gr_skiphead.xml b/grc/blocks/gr_skiphead.xml
index 0849ad2981..be1c0c7655 100644
--- a/grc/blocks/gr_skiphead.xml
+++ b/grc/blocks/gr_skiphead.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Skip Head</name>
+ <name>Skip Head (old)</name>
<key>gr_skiphead</key>
<import>from gnuradio import gr</import>
<make>gr.skiphead($type.size*$vlen, $num_items)</make>
diff --git a/grc/blocks/gr_socket_pdu.xml b/grc/blocks/gr_socket_pdu.xml
index a175c36991..020958d739 100644
--- a/grc/blocks/gr_socket_pdu.xml
+++ b/grc/blocks/gr_socket_pdu.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Socket PDU</name>
+ <name>Socket PDU (old)</name>
<key>gr_socket_pdu</key>
<import>from gnuradio import gr</import>
<make>gr.socket_pdu($type, $host, $port, $mtu)</make>
diff --git a/grc/blocks/gr_stream_mux.xml b/grc/blocks/gr_stream_mux.xml
index 8efe7b6555..53ce31bc96 100644
--- a/grc/blocks/gr_stream_mux.xml
+++ b/grc/blocks/gr_stream_mux.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Stream Mux</name>
+ <name>Stream Mux (old)</name>
<key>gr_stream_mux</key>
<import>from gnuradio import gr</import>
<make>gr.stream_mux($type.size*$vlen, $lengths)</make>
diff --git a/grc/blocks/gr_stream_to_streams.xml b/grc/blocks/gr_stream_to_streams.xml
index 82542b8d44..7f99aae1b6 100644
--- a/grc/blocks/gr_stream_to_streams.xml
+++ b/grc/blocks/gr_stream_to_streams.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Stream to Streams</name>
+ <name>Stream to Streams (old)</name>
<key>gr_stream_to_streams</key>
<import>from gnuradio import gr</import>
<make>gr.stream_to_streams($type.size*$vlen, $num_streams)</make>
diff --git a/grc/blocks/gr_stream_to_vector.xml b/grc/blocks/gr_stream_to_vector.xml
index 296d786f8c..83d20607cc 100644
--- a/grc/blocks/gr_stream_to_vector.xml
+++ b/grc/blocks/gr_stream_to_vector.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Stream to Vector</name>
+ <name>Stream to Vector (old)</name>
<key>gr_stream_to_vector</key>
<import>from gnuradio import gr</import>
<make>gr.stream_to_vector($type.size*$vlen, $num_items)</make>
diff --git a/grc/blocks/gr_streams_to_stream.xml b/grc/blocks/gr_streams_to_stream.xml
index 7aadd7eef2..eed8be6d37 100644
--- a/grc/blocks/gr_streams_to_stream.xml
+++ b/grc/blocks/gr_streams_to_stream.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Streams to Stream</name>
+ <name>Streams to Stream (old)</name>
<key>gr_streams_to_stream</key>
<import>from gnuradio import gr</import>
<make>gr.streams_to_stream($type.size*$vlen, $num_streams)</make>
diff --git a/grc/blocks/gr_streams_to_vector.xml b/grc/blocks/gr_streams_to_vector.xml
index 4ecdcb2d41..944a511996 100644
--- a/grc/blocks/gr_streams_to_vector.xml
+++ b/grc/blocks/gr_streams_to_vector.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Streams to Vector</name>
+ <name>Streams to Vector (old)</name>
<key>gr_streams_to_vector</key>
<import>from gnuradio import gr</import>
<make>gr.streams_to_vector($type.size*$vlen, $num_streams)</make>
diff --git a/grc/blocks/gr_sub_xx.xml b/grc/blocks/gr_sub_xx.xml
index c677747da9..54c7883aff 100644
--- a/grc/blocks/gr_sub_xx.xml
+++ b/grc/blocks/gr_sub_xx.xml
@@ -6,7 +6,7 @@
###################################################
-->
<block>
- <name>Subtract</name>
+ <name>Subtract (old)</name>
<key>gr_sub_xx</key>
<import>from gnuradio import gr</import>
<make>gr.sub_$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_tag_debug.xml b/grc/blocks/gr_tag_debug.xml
index 4af7729be9..c3ac63735c 100644
--- a/grc/blocks/gr_tag_debug.xml
+++ b/grc/blocks/gr_tag_debug.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Tag Debug</name>
+ <name>Tag Debug (old)</name>
<key>gr_tag_debug</key>
<import>from gnuradio import gr</import>
<make>gr.tag_debug($type.size*$vlen, $name)</make>
diff --git a/grc/blocks/gr_tagged_stream_to_pdu.xml b/grc/blocks/gr_tagged_stream_to_pdu.xml
index e2f754c9eb..75b4ab5d1f 100644
--- a/grc/blocks/gr_tagged_stream_to_pdu.xml
+++ b/grc/blocks/gr_tagged_stream_to_pdu.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Tagged Stream to PDU</name>
+ <name>Tagged Stream to PDU (old)</name>
<key>gr_tagged_stream_to_pdu</key>
<import>from gnuradio import gr</import>
<make>gr.tagged_stream_to_pdu($type.tv)</make>
diff --git a/grc/blocks/gr_threshold_ff.xml b/grc/blocks/gr_threshold_ff.xml
index 740ce5794c..12650297a7 100644
--- a/grc/blocks/gr_threshold_ff.xml
+++ b/grc/blocks/gr_threshold_ff.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Threshold</name>
+ <name>Threshold (old)</name>
<key>gr_threshold_ff</key>
<import>from gnuradio import gr</import>
<make>gr.threshold_ff($low, $high, $init)</make>
diff --git a/grc/blocks/gr_throttle.xml b/grc/blocks/gr_throttle.xml
index e3a5a2ba19..978aa29662 100644
--- a/grc/blocks/gr_throttle.xml
+++ b/grc/blocks/gr_throttle.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Throttle</name>
+ <name>Throttle (old)</name>
<key>gr_throttle</key>
<throttle>1</throttle>
<import>from gnuradio import gr</import>
diff --git a/grc/blocks/gr_transcendental.xml b/grc/blocks/gr_transcendental.xml
index eede447f98..2862fb17e6 100644
--- a/grc/blocks/gr_transcendental.xml
+++ b/grc/blocks/gr_transcendental.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Transcendental</name>
+ <name>Transcendental (old)</name>
<key>gr_transcendental</key>
<import>from gnuradio import gr</import>
<make>gr.transcendental($name, "$type")</make>
diff --git a/grc/blocks/gr_tuntap_pdu.xml b/grc/blocks/gr_tuntap_pdu.xml
index f169345afa..eff31219fb 100644
--- a/grc/blocks/gr_tuntap_pdu.xml
+++ b/grc/blocks/gr_tuntap_pdu.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>TunTap PDU</name>
+ <name>TunTap PDU (old)</name>
<key>gr_tuntap_pdu</key>
<import>from gnuradio import gr</import>
<make>gr.tuntap_pdu($ifn, $mtu)</make>
diff --git a/grc/blocks/gr_uchar_to_float.xml b/grc/blocks/gr_uchar_to_float.xml
index 0a5f7f96a5..8e270681e0 100644
--- a/grc/blocks/gr_uchar_to_float.xml
+++ b/grc/blocks/gr_uchar_to_float.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>UChar To Float</name>
+ <name>UChar To Float (old)</name>
<key>gr_uchar_to_float</key>
<import>from gnuradio import gr</import>
<make>gr.uchar_to_float()</make>
diff --git a/grc/blocks/gr_udp_sink.xml b/grc/blocks/gr_udp_sink.xml
index 45f81075f0..006848048a 100644
--- a/grc/blocks/gr_udp_sink.xml
+++ b/grc/blocks/gr_udp_sink.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>UDP Sink</name>
+ <name>UDP Sink (old)</name>
<key>gr_udp_sink</key>
<import>from gnuradio import gr</import>
<make>gr.udp_sink($type.size*$vlen, $ipaddr, $port, $psize, $eof)</make>
diff --git a/grc/blocks/gr_udp_source.xml b/grc/blocks/gr_udp_source.xml
index a1b961651f..f74d58e74e 100644
--- a/grc/blocks/gr_udp_source.xml
+++ b/grc/blocks/gr_udp_source.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>UDP Source</name>
+ <name>UDP Source (old)</name>
<key>gr_udp_source</key>
<import>from gnuradio import gr</import>
<make>gr.udp_source($type.size*$vlen, $ipaddr, $port, $psize, $eof, $wait)</make>
diff --git a/grc/blocks/gr_unpack_k_bits_bb.xml b/grc/blocks/gr_unpack_k_bits_bb.xml
index 9917644ab5..ce6f19b072 100644
--- a/grc/blocks/gr_unpack_k_bits_bb.xml
+++ b/grc/blocks/gr_unpack_k_bits_bb.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Unpack K Bits</name>
+ <name>Unpack K Bits (old)</name>
<key>gr_unpack_k_bits_bb</key>
<import>from gnuradio import gr</import>
<make>gr.unpack_k_bits_bb($k)</make>
diff --git a/grc/blocks/gr_unpacked_to_packed_xx.xml b/grc/blocks/gr_unpacked_to_packed_xx.xml
index 427c800824..3366d65055 100644
--- a/grc/blocks/gr_unpacked_to_packed_xx.xml
+++ b/grc/blocks/gr_unpacked_to_packed_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Unpacked to Packed</name>
+ <name>Unpacked to Packed (old)</name>
<key>gr_unpacked_to_packed_xx</key>
<import>from gnuradio import gr</import>
<make>gr.unpacked_to_packed_$(type.fcn)($bits_per_chunk, $endianness)</make>
diff --git a/grc/blocks/gr_vco_f.xml b/grc/blocks/gr_vco_f.xml
index e49c539651..196f56a2d0 100644
--- a/grc/blocks/gr_vco_f.xml
+++ b/grc/blocks/gr_vco_f.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>VCO</name>
+ <name>VCO (old)</name>
<key>gr_vco_f</key>
<import>from gnuradio import gr</import>
<make>gr.vco_f($samp_rate, $sensitivity, $amplitude)</make>
diff --git a/grc/blocks/gr_vector_insert_x.xml b/grc/blocks/gr_vector_insert_x.xml
index f9ce1f6544..8d8e869381 100644
--- a/grc/blocks/gr_vector_insert_x.xml
+++ b/grc/blocks/gr_vector_insert_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Vector Insert</name>
+ <name>Vector Insert (old)</name>
<key>gr_vector_insert_x</key>
<import>from gnuradio import gr</import>
<make>gr.vector_insert_$(type.fcn)($vector, $period, $offset)</make>
diff --git a/grc/blocks/gr_vector_sink_x.xml b/grc/blocks/gr_vector_sink_x.xml
index 3bd998698f..e71480565f 100644
--- a/grc/blocks/gr_vector_sink_x.xml
+++ b/grc/blocks/gr_vector_sink_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Vector Sink</name>
+ <name>Vector Sink (old)</name>
<key>gr_vector_sink_x</key>
<import>from gnuradio import gr</import>
<make>gr.vector_sink_$(type.fcn)($vlen)</make>
diff --git a/grc/blocks/gr_vector_source_x.xml b/grc/blocks/gr_vector_source_x.xml
index b3e595a453..7d00feb16a 100644
--- a/grc/blocks/gr_vector_source_x.xml
+++ b/grc/blocks/gr_vector_source_x.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Vector Source</name>
+ <name>Vector Source (old)</name>
<key>gr_vector_source_x</key>
<import>from gnuradio import gr</import>
<make>gr.vector_source_$(type.fcn)($vector, $repeat, $vlen, $tags)
diff --git a/grc/blocks/gr_vector_to_stream.xml b/grc/blocks/gr_vector_to_stream.xml
index d56d340677..1091116fab 100644
--- a/grc/blocks/gr_vector_to_stream.xml
+++ b/grc/blocks/gr_vector_to_stream.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Vector to Stream</name>
+ <name>Vector to Stream (old)</name>
<key>gr_vector_to_stream</key>
<import>from gnuradio import gr</import>
<make>gr.vector_to_stream($type.size*$vlen, $num_items)</make>
diff --git a/grc/blocks/gr_vector_to_streams.xml b/grc/blocks/gr_vector_to_streams.xml
index 86cb56813c..29ee2d1321 100644
--- a/grc/blocks/gr_vector_to_streams.xml
+++ b/grc/blocks/gr_vector_to_streams.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Vector to Streams</name>
+ <name>Vector to Streams (old)</name>
<key>gr_vector_to_streams</key>
<import>from gnuradio import gr</import>
<make>gr.vector_to_streams($type.size*$vlen, $num_streams)</make>
diff --git a/grc/blocks/gr_wavfile_sink.xml b/grc/blocks/gr_wavfile_sink.xml
index 651e16cb6b..a1c002a3f9 100644
--- a/grc/blocks/gr_wavfile_sink.xml
+++ b/grc/blocks/gr_wavfile_sink.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Wav File Sink</name>
+ <name>Wav File Sink (old)</name>
<key>gr_wavfile_sink</key>
<import>from gnuradio import gr</import>
<make>gr.wavfile_sink($file, $nchan, $samp_rate, $bits_per_sample)</make>
diff --git a/grc/blocks/gr_wavfile_source.xml b/grc/blocks/gr_wavfile_source.xml
index 433bb0af21..80c864e12a 100644
--- a/grc/blocks/gr_wavfile_source.xml
+++ b/grc/blocks/gr_wavfile_source.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Wav File Source</name>
+ <name>Wav File Source (old)</name>
<key>gr_wavfile_source</key>
<import>from gnuradio import gr</import>
<make>gr.wavfile_source($file, $repeat)</make>
diff --git a/grc/blocks/gr_xor_xx.xml b/grc/blocks/gr_xor_xx.xml
index c014cbe577..79d97b0f5b 100644
--- a/grc/blocks/gr_xor_xx.xml
+++ b/grc/blocks/gr_xor_xx.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Xor</name>
+ <name>Xor (old)</name>
<key>gr_xor_xx</key>
<import>from gnuradio import gr</import>
<make>gr.xor_$(type.fcn)()</make>