diff --git a/srsue/ue.conf.example b/srsue/ue.conf.example
index 0dc68b19c..f54c20cc8 100644
--- a/srsue/ue.conf.example
+++ b/srsue/ue.conf.example
@@ -7,25 +7,25 @@
 #
 # dl_earfcn: Downlink EARFCN code.
 # freq_offset: Uplink and Downlink optional frequency offset (in Hz)
-# tx_gain: Transmit gain (dB). 
+# tx_gain: Transmit gain (dB).
 # rx_gain: Optional receive gain (dB). If disabled, AGC if enabled
 #
-# Optional parameters: 
+# Optional parameters:
 # dl_freq:            Override DL frequency corresponding to dl_earfcn
 # ul_freq:            Override UL frequency corresponding to dl_earfcn
 # nof_radios:         Number of available RF devices
 # nof_rf_channels:    Number of RF channels per radio
 # nof_rx_ant:         Number of RX antennas per channel
-# device_name:        Device driver family. Supported options: "auto" (uses first found), "UHD" or "bladeRF" 
-# device_args:        Arguments for the device driver. Options are "auto" or any string. 
+# device_name:        Device driver family. Supported options: "auto" (uses first found), "UHD" or "bladeRF"
+# device_args:        Arguments for the device driver. Options are "auto" or any string.
 #                     Default for UHD: "recv_frame_size=9232,send_frame_size=9232"
 #                     Default for bladeRF: ""
 # device_args_2:      Arguments for the RF device driver 2.
 # device_args_3:      Arguments for the RF device driver 3.
 # time_adv_nsamples:  Transmission time advance (in number of samples) to compensate for RF delay
-#                     from antenna to timestamp insertion. 
+#                     from antenna to timestamp insertion.
 #                     Default "auto". B210 USRP: 100 samples, bladeRF: 27.
-# burst_preamble_us:  Preamble length to transmit before start of burst. 
+# burst_preamble_us:  Preamble length to transmit before start of burst.
 #                     Default "auto". B210 USRP: 400 us, bladeRF: 0 us.
 # continuous_tx:      Transmit samples continuously to the radio or on bursts (auto/yes/no).
 #                     Default is auto (yes for UHD, no for rest)
@@ -118,7 +118,7 @@ algo = xor
 k    = 00112233445566778899aabbccddeeff
 imsi = 001010123456789
 imei = 353490069873319
-#reader = 
+#reader =
 #pin  = 1234
 
 #####################################################################
@@ -168,8 +168,8 @@ imei = 353490069873319
 # tun_dev_netmask:      Netmask of the tun_srsue device. Default: 255.255.255.0
 #####################################################################
 [gw]
-#tun_dev_name         = tun_srsue
-#tun_dev_netmask      = 255.255.255.0
+#ip_devname = tun_srsue
+#ip_netmask = 255.255.255.0
 
 #####################################################################
 # GUI configuration
@@ -228,23 +228,23 @@ enable = false
 #
 # rx_gain_offset:       RX Gain offset to add to rx_gain to calibrate RSRP readings
 # prach_gain:           PRACH gain (dB). If defined, forces a gain for the tranmsission of PRACH only.,
-#                       Default is to use tx_gain in [rf] section. 
-# cqi_max:              Upper bound on the maximum CQI to be reported. Default 15. 
+#                       Default is to use tx_gain in [rf] section.
+# cqi_max:              Upper bound on the maximum CQI to be reported. Default 15.
 # cqi_fixed:            Fixes the reported CQI to a constant value. Default disabled.
 # snr_ema_coeff:        Sets the SNR exponential moving average coefficient (Default 0.1)
 # snr_estim_alg:        Sets the noise estimation algorithm. (Default refs)
-#                          Options: pss:   use difference between received and known pss signal, 
+#                          Options: pss:   use difference between received and known pss signal,
 #                                   refs:  use difference between noise references and noiseless (after filtering)
 #                                   empty: use empty subcarriers in the boarder of pss/sss signal
 # pdsch_max_its:        Maximum number of turbo decoder iterations (Default 4)
 # nof_phy_threads:      Selects the number of PHY threads (maximum 4, minimum 1, default 2)
-# equalizer_mode:       Selects equalizer mode. Valid modes are: "mmse", "zf" or any 
+# equalizer_mode:       Selects equalizer mode. Valid modes are: "mmse", "zf" or any
 #                       non-negative real number to indicate a regularized zf coefficient.
 #                       Default is MMSE.
 # sfo_ema:              EMA coefficient to average sample offsets used to compute SFO
 # sfo_correct_period:   Period in ms to correct sample time to adjust for SFO
 # sss_algorithm:        Selects the SSS estimation algorithm. Can choose between
-#                       {full, partial, diff}. 
+#                       {full, partial, diff}.
 # estimator_fil_auto:   The channel estimator smooths the channel estimate with an adaptative filter.
 # estimator_fil_stddev: Sets the channel estimator smooth gaussian filter standard deviation.
 # estimator_fil_order:  Sets the channel estimator smooth gaussian filter order (even values perform better).