diff --git a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
index 22584d4e4..5c610f999 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
@@ -177,71 +177,19 @@ Resampler.sample_freq_out=2000000
 
 ;######### CHANNELS GLOBAL CONFIG ############
 ;#count: Number of available GPS satellite channels.
-Channels_GPS.count=6
+Channels_1C.count=6
 ;#count: Number of available Galileo satellite channels.
-Channels_Galileo.count=0
+Channels_1B.count=0
 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
 Channels.in_acquisition=1
-;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
-;#if the option is disabled by default is assigned GPS
-Channel.system=GPS
+
 
 ;#signal:
 ;# "1C" GPS L1 C/A
-;# "1P" GPS L1 P
-;# "1W" GPS L1 Z-tracking and similar (AS on)
-;# "1Y" GPS L1 Y
-;# "1M" GPS L1 M
-;# "1N" GPS L1 codeless
-;# "2C" GPS L2 C/A
-;# "2D" GPS L2 L1(C/A)+(P2-P1) semi-codeless
 ;# "2S" GPS L2 L2C (M)
-;# "2L" GPS L2 L2C (L)
-;# "2X" GPS L2 L2C (M+L)
-;# "2P" GPS L2 P
-;# "2W" GPS L2 Z-tracking and similar (AS on)
-;# "2Y" GPS L2 Y
-;# "2M" GPS GPS L2 M
-;# "2N" GPS L2 codeless
-;# "5I" GPS L5 I
-;# "5Q" GPS L5 Q
-;# "5X" GPS L5 I+Q
-;# "1C" GLONASS G1 C/A
-;# "1P" GLONASS G1 P
-;# "2C" GLONASS G2 C/A  (Glonass M)
-;# "2P" GLONASS G2 P
-;# "1A" GALILEO E1 A (PRS)
 ;# "1B" GALILEO E1 B (I/NAV OS/CS/SoL)
-;# "1C" GALILEO E1 C (no data)
-;# "1X" GALILEO E1 B+C
-;# "1Z" GALILEO E1 A+B+C
-;# "5I" GALILEO E5a I (F/NAV OS)
-;# "5Q" GALILEO E5a Q  (no data)
 ;# "5X" GALILEO E5a I+Q
-;# "7I" GALILEO E5b I
-;# "7Q" GALILEO E5b Q
-;# "7X" GALILEO E5b I+Q
-;# "8I" GALILEO E5 I
-;# "8Q" GALILEO E5 Q
-;# "8X" GALILEO E5 I+Q
-;# "6A" GALILEO E6 A
-;# "6B" GALILEO E6 B
-;# "6C" GALILEO E6 C
-;# "6X" GALILEO E6 B+C
-;# "6Z" GALILEO E6 A+B+C
-;# "1C" SBAS L1 C/A
-;# "5I" SBAS L5 I
-;# "5Q" SBAS L5 Q
-;# "5X" SBAS L5 I+Q
-;# "2I" COMPASS E2 I
-;# "2Q" COMPASS E2 Q
-;# "2X" COMPASS E2 IQ
-;# "7I" COMPASS E5b I
-;# "7Q" COMPASS E5b Q
-;# "7X" COMPASS E5b IQ
-;# "6I" COMPASS E6 I
-;# "6Q" COMPASS E6 Q
-;# "6X" COMPASS E6 IQ
+
 ;#if the option is disabled by default is assigned "1C" GPS L1 C/A
 Channel.signal=1C
 
@@ -250,46 +198,45 @@ Channel.signal=1C
 
 ;######### CHANNEL 0 CONFIG ############
 
-Channel0.system=GPS
-Channel0.signal=1C
+;Channel0.system=GPS
+;Channel0.signal=1C
 
 ;#satellite: Satellite PRN ID for this channel. Disable this option to random search
-Channel0.satellite=11
+;Channel0.satellite=11
 
 ;######### CHANNEL 1 CONFIG ############
 
-Channel1.system=GPS
-Channel1.signal=1C
-Channel1.satellite=18
+;Channel1.system=GPS
+;Channel1.signal=1C
+;Channel1.satellite=18
 
 
 ;######### ACQUISITION GLOBAL CONFIG ############
 
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
-Acquisition_GPS.dump=false
+Acquisition_1C.dump=false
 ;#filename: Log path and filename
-Acquisition_GPS.dump_filename=./acq_dump.dat
-;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition_GPS.item_type=gr_complex
+Acquisition_1C.dump_filename=./acq_dump.dat
+;#item_type: Type and resolution for each of the signal samples.
+Acquisition_1C.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz]
-Acquisition_GPS.if=0
+Acquisition_1C.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_GPS.coherent_integration_time_ms=1
-;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_GPS.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition_1C.coherent_integration_time_ms=1
+Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
 ;#threshold: Acquisition threshold. It will be ignored if pfa is defined.
-Acquisition_GPS.threshold=0.01
+Acquisition_1C.threshold=0.01
 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-;Acquisition_GPS.pfa=0.0001
+;Acquisition_1C.pfa=0.0001
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_GPS.doppler_max=10000
+Acquisition_1C.doppler_max=10000
 ;#doppler_max: Doppler step in the grid search [Hz]
-Acquisition_GPS.doppler_step=500
+Acquisition_1C.doppler_step=500
 ;#bit_transition_flag: Enable or disable a strategy to deal with bit transitions in GPS signals: process two dwells and take
 maximum test statistics. Only use with implementation: [GPS_L1_CA_PCPS_Acquisition] (should not be used for Galileo_E1_PCPS_Ambiguous_Acquisition])
-Acquisition_GPS.bit_transition_flag=false
+Acquisition_1C.bit_transition_flag=false
 ;#max_dwells: Maximum number of consecutive dwells to be processed. It will be ignored if bit_transition_flag=true
-Acquisition_GPS.max_dwells=1
+Acquisition_1C.max_dwells=1
 
 
 ;######### ACQUISITION CHANNELS CONFIG ######
@@ -299,37 +246,37 @@ Acquisition_GPS.max_dwells=1
 ;######### TRACKING GLOBAL CONFIG ############
 
 ;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking]
-Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples.
-Tracking_GPS.item_type=gr_complex
+Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
-Tracking_GPS.if=0
+Tracking_1C.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
-Tracking_GPS.dump=false
+Tracking_1C.dump=false
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking_GPS.dump_filename=./tracking_ch_
+Tracking_1C.dump_filename=./tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_GPS.pll_bw_hz=50.0;
+Tracking_1C.pll_bw_hz=30.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking_GPS.dll_bw_hz=2.0;
+Tracking_1C.dll_bw_hz=4.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking_GPS.order=3;
+Tracking_1C.order=3;
 
-;#early_late_space_chips: correlator early-late space [chips]. Use [0.5]
-Tracking_GPS.early_late_space_chips=0.5;
+;#early_late_space_chips: correlator early-late space [chips]
+Tracking_1C.early_late_space_chips=0.5;
 
 ;######### TELEMETRY DECODER GPS CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
-TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder
-TelemetryDecoder_GPS.dump=false
+TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
+TelemetryDecoder_1C.dump=false
 ;#decimation factor
-TelemetryDecoder_GPS.decimation_factor=1;
+TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
 ;#implementation:
diff --git a/conf/gnss-sdr_multisource_Hybrid_ishort.conf b/conf/gnss-sdr_multisource_Hybrid_ishort.conf
index 31f777693..87300194b 100644
--- a/conf/gnss-sdr_multisource_Hybrid_ishort.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_ishort.conf
@@ -283,14 +283,12 @@ Resampler1.sample_freq_out=4000000
 
 ;######### CHANNELS GLOBAL CONFIG ############
 ;#count: Number of available GPS satellite channels.
-Channels_GPS.count=2
+Channels_1C.count=2
 ;#count: Number of available Galileo satellite channels.
-Channels_Galileo.count=2
+Channels_1B.count=2
 ;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
 Channels.in_acquisition=1
-;#system: GPS, GLONASS, GALILEO, SBAS or COMPASS
-;#if the option is disabled by default is assigned GPS
-Channel.system=GPS, Galileo
+
 
 ;# CHANNEL CONNECTION
 Channel0.RF_channel_ID=0
@@ -305,118 +303,118 @@ Channel.signal=1B
 ;######### GPS ACQUISITION CONFIG ############
 
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
-Acquisition_GPS.dump=false
+Acquisition_1C.dump=false
 ;#filename: Log path and filename
-Acquisition_GPS.dump_filename=./acq_dump.dat
+Acquisition_1C.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition_GPS.item_type=gr_complex
+Acquisition_1C.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz]
-Acquisition_GPS.if=0
+Acquisition_1C.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_GPS.sampled_ms=1
+Acquisition_1C.sampled_ms=1
 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_GPS.implementation=GPS_L1_CA_PCPS_Acquisition
+Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
 ;#threshold: Acquisition threshold
-Acquisition_GPS.threshold=0.0075
+Acquisition_1C.threshold=0.0075
 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-;Acquisition_GPS.pfa=0.01
+;Acquisition_1C.pfa=0.01
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_GPS.doppler_max=10000
+Acquisition_1C.doppler_max=10000
 ;#doppler_max: Doppler step in the grid search [Hz]
-Acquisition_GPS.doppler_step=500
+Acquisition_1C.doppler_step=500
 
 
 ;######### GALILEO ACQUISITION CONFIG ############
 
 ;#dump: Enable or disable the acquisition internal data file logging [true] or [false]
-Acquisition_Galileo.dump=false
+Acquisition_1B.dump=false
 ;#filename: Log path and filename
-Acquisition_Galileo.dump_filename=./acq_dump.dat
+Acquisition_1B.dump_filename=./acq_dump.dat
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
-Acquisition_Galileo.item_type=gr_complex
+Acquisition_1B.item_type=gr_complex
 ;#if: Signal intermediate frequency in [Hz]
-Acquisition_Galileo.if=0
+Acquisition_1B.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
-Acquisition_Galileo.sampled_ms=4
+Acquisition_1B.sampled_ms=4
 ;#implementation: Acquisition algorithm selection for this channel: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_Galileo.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
+Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
 ;#threshold: Acquisition threshold
-;Acquisition_Galileo.threshold=0
+;Acquisition_1B.threshold=0
 ;#pfa: Acquisition false alarm probability. This option overrides the threshold option. Only use with implementations: [GPS_L1_CA_PCPS_Acquisition] or [Galileo_E1_PCPS_Ambiguous_Acquisition]
-Acquisition_Galileo.pfa=0.0000008
+Acquisition_1B.pfa=0.0000008
 ;#doppler_max: Maximum expected Doppler shift [Hz]
-Acquisition_Galileo.doppler_max=15000
+Acquisition_1B.doppler_max=15000
 ;#doppler_max: Doppler step in the grid search [Hz]
-Acquisition_Galileo.doppler_step=125
+Acquisition_1B.doppler_step=125
 
 ;######### TRACKING GPS CONFIG ############
 
 ;#implementation: Selected tracking algorithm: [GPS_L1_CA_DLL_PLL_Tracking] or [GPS_L1_CA_DLL_PLL_C_Aid_Tracking] or [GPS_L1_CA_TCP_CONNECTOR_Tracking] or [Galileo_E1_DLL_PLL_VEML_Tracking]
-Tracking_GPS.implementation=GPS_L1_CA_DLL_PLL_Tracking
+Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
-Tracking_GPS.item_type=gr_complex
+Tracking_1C.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
-Tracking_GPS.if=0
+Tracking_1C.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
-Tracking_GPS.dump=false
+Tracking_1C.dump=false
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking_GPS.dump_filename=../data/epl_tracking_ch_
+Tracking_1C.dump_filename=../data/epl_tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_GPS.pll_bw_hz=45.0;
+Tracking_1C.pll_bw_hz=45.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking_GPS.dll_bw_hz=4.0;
+Tracking_1C.dll_bw_hz=4.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking_GPS.order=3;
+Tracking_1C.order=3;
 
 ;######### TRACKING GALILEO CONFIG ############
 
 ;#implementation: Selected tracking algorithm: [Galileo_E1_DLL_PLL_VEML_Tracking]
-Tracking_Galileo.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
+Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 ;#item_type: Type and resolution for each of the signal samples. Use only [gr_complex] in this version.
-Tracking_Galileo.item_type=gr_complex
+Tracking_1B.item_type=gr_complex
 
 ;#sampling_frequency: Signal Intermediate Frequency in [Hz]
-Tracking_Galileo.if=0
+Tracking_1B.if=0
 
 ;#dump: Enable or disable the Tracking internal binary data file logging [true] or [false]
-Tracking_Galileo.dump=false
+Tracking_1B.dump=false
 
 ;#dump_filename: Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
-Tracking_Galileo.dump_filename=../data/veml_tracking_ch_
+Tracking_1B.dump_filename=../data/veml_tracking_ch_
 
 ;#pll_bw_hz: PLL loop filter bandwidth [Hz]
-Tracking_Galileo.pll_bw_hz=15.0;
+Tracking_1B.pll_bw_hz=15.0;
 
 ;#dll_bw_hz: DLL loop filter bandwidth [Hz]
-Tracking_Galileo.dll_bw_hz=2.0;
+Tracking_1B.dll_bw_hz=2.0;
 
 ;#order: PLL/DLL loop filter order [2] or [3]
-Tracking_Galileo.order=3;
+Tracking_1B.order=3;
 
 ;#early_late_space_chips: correlator early-late space [chips]. Use [0.5] for GPS and [0.15] for Galileo
-Tracking_Galileo.early_late_space_chips=0.15;
+Tracking_1B.early_late_space_chips=0.15;
 
 ;#very_early_late_space_chips: only for [Galileo_E1_DLL_PLL_VEML_Tracking], correlator very early-late space [chips]. Use [0.6]
-Tracking_Galileo.very_early_late_space_chips=0.6;
+Tracking_1B.very_early_late_space_chips=0.6;
 
 
 ;######### TELEMETRY DECODER GPS CONFIG ############
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
-TelemetryDecoder_GPS.implementation=GPS_L1_CA_Telemetry_Decoder
-TelemetryDecoder_GPS.dump=false
+TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
+TelemetryDecoder_1C.dump=false
 ;#decimation factor
-TelemetryDecoder_GPS.decimation_factor=4;
+TelemetryDecoder_1C.decimation_factor=4;
 
 ;######### TELEMETRY DECODER GALILEO CONFIG ############
 ;#implementation: Use [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
-TelemetryDecoder_Galileo.implementation=Galileo_E1B_Telemetry_Decoder
-TelemetryDecoder_Galileo.dump=false
+TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
+TelemetryDecoder_1B.dump=false
 
 
 ;######### OBSERVABLES CONFIG ############