diff --git a/firmware/console/console_io.cpp b/firmware/console/console_io.cpp
index 4f19e27384..dc9d3159c4 100644
--- a/firmware/console/console_io.cpp
+++ b/firmware/console/console_io.cpp
@@ -21,7 +21,7 @@
 #include "global.h"
 #include "engine.h"
 #include "console_io.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "tunerstudio.h"
 
 #if EFI_SIMULATOR
diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index d1e8bf5056..aa6fbc1a46 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -51,7 +51,7 @@
 #include "spark_logic.h"
 #include "idle_thread.h"
 #include "engine_configuration.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "svnversion.h"
 #include "engine.h"
 #include "lcd_controller.h"
diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp
index 5820457152..aa0008d4da 100644
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@@ -2,7 +2,7 @@
  * @file	advance_map.cpp
  *
  * @date Mar 27, 2013
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  *
  * This file is part of rusEfi - see http://rusefi.com
  *
@@ -23,7 +23,6 @@
 #include "engine.h"
 #include "advance_map.h"
 #include "interpolation.h"
-#include "rfiutil.h"
 #include "engine_math.h"
 #include "tps.h"
 #include "idle_thread.h"
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 0aad3add45..35b1a9d011 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -19,7 +19,7 @@
 #include "advance_map.h"
 #include "speed_density.h"
 #include "advance_map.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "settings.h"
 #include "aux_valves.h"
 #include "map_averaging.h"
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index a6f1c27861..4fb1fbd110 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -41,7 +41,7 @@
 #include "tunerstudio.h"
 #endif
 #include "injector_central.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "engine_math.h"
 #if EFI_WAVE_ANALYZER
 #include "wave_analyzer.h"
diff --git a/firmware/controllers/scheduling/event_queue.cpp b/firmware/controllers/scheduling/event_queue.cpp
index 74d54e4e8e..5df3388479 100644
--- a/firmware/controllers/scheduling/event_queue.cpp
+++ b/firmware/controllers/scheduling/event_queue.cpp
@@ -15,7 +15,7 @@
 #include "os_access.h"
 #include "event_queue.h"
 #include "efitime.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 uint32_t maxSchedulingPrecisionLoss = 0;
 
diff --git a/firmware/controllers/scheduling/single_timer_executor.cpp b/firmware/controllers/scheduling/single_timer_executor.cpp
index b9fbea6822..de9a6c7918 100644
--- a/firmware/controllers/scheduling/single_timer_executor.cpp
+++ b/firmware/controllers/scheduling/single_timer_executor.cpp
@@ -30,7 +30,7 @@
 
 #include "microsecond_timer.h"
 #include "tunerstudio_configuration.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 #include "engine.h"
 EXTERN_ENGINE;
diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp
index 714a9bd9d9..7f69545dda 100644
--- a/firmware/controllers/trigger/main_trigger_callback.cpp
+++ b/firmware/controllers/trigger/main_trigger_callback.cpp
@@ -48,7 +48,7 @@
 #include "engine_controller.h"
 #include "efi_gpio.h"
 #if EFI_PROD_CODE
-#include "rfiutil.h"
+#include "os_util.h"
 #endif /* EFI_HISTOGRAMS */
 #include "local_version_holder.h"
 #include "event_queue.h"
diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp
index 71e7127c38..db18383745 100644
--- a/firmware/controllers/trigger/rpm_calculator.cpp
+++ b/firmware/controllers/trigger/rpm_calculator.cpp
@@ -20,7 +20,7 @@
 #include "engine_math.h"
 
 #if EFI_PROD_CODE
-#include "rfiutil.h"
+#include "os_util.h"
 #include "engine.h"
 #endif
 
diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp
index 8d8e45366a..4788e42264 100644
--- a/firmware/controllers/trigger/spark_logic.cpp
+++ b/firmware/controllers/trigger/spark_logic.cpp
@@ -2,7 +2,7 @@
  * @file spark_logic.cpp
  *
  * @date Sep 15, 2016
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #include "global.h"
@@ -11,7 +11,6 @@
 
 #include "utlist.h"
 #include "event_queue.h"
-#include "rfiutil.h"
 
 #if EFI_TUNER_STUDIO
 #include "tunerstudio_configuration.h"
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index 36365501e1..e42a7d0e58 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -3,7 +3,7 @@
  * Here we have a bunch of higher-level methods which are not directly related to actual signal decoding
  *
  * @date Feb 23, 2014
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #include "global.h"
@@ -25,6 +25,20 @@
 
 #include "rpm_calculator.h"
 
+#if EFI_PROD_CODE
+#include "pin_repository.h"
+#endif /* EFI_PROD_CODE */
+
+#if EFI_TUNER_STUDIO
+#include "tunerstudio.h"
+extern TunerStudioOutputChannels tsOutputChannels;
+#endif /* EFI_TUNER_STUDIO */
+
+#if EFI_ENGINE_SNIFFER
+#include "engine_sniffer.h"
+WaveChart waveChart;
+#endif /* EFI_ENGINE_SNIFFER */
+
 trigger_central_s::trigger_central_s() : hwEventCounters() {
 
 }
@@ -50,22 +64,6 @@ int TriggerCentral::getHwEventCounter(int index) const {
 
 #if EFI_SHAFT_POSITION_INPUT
 
-
-#if EFI_PROD_CODE
-#include "rfiutil.h"
-#include "pin_repository.h"
-#endif /* EFI_PROD_CODE */
-
-#if EFI_TUNER_STUDIO
-#include "tunerstudio.h"
-extern TunerStudioOutputChannels tsOutputChannels;
-#endif /* EFI_TUNER_STUDIO */
-
-#if EFI_ENGINE_SNIFFER
-#include "engine_sniffer.h"
-WaveChart waveChart;
-#endif /* EFI_ENGINE_SNIFFER */
-
 EXTERN_ENGINE;
 
 #if EFI_HISTOGRAMS
diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index 6e8e8838ab..858302a150 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -2,7 +2,7 @@
  * @file	trigger_decoder.cpp
  *
  * @date Dec 24, 2013
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  *
  * This file is part of rusEfi - see http://rusefi.com
  *
@@ -21,7 +21,6 @@
 #include "global.h"
 #include "os_access.h"
 
-
 #include "obd_error_codes.h"
 #include "trigger_decoder.h"
 #include "cyclic_buffer.h"
@@ -30,7 +29,6 @@
 #include "engine_math.h"
 #include "trigger_central.h"
 #include "trigger_simulator.h"
-#include "rfiutil.h"
 
 #if EFI_SENSOR_CHART
 #include "sensor_chart.h"
diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp
index 26d414b19c..d5fc35f2aa 100644
--- a/firmware/development/engine_sniffer.cpp
+++ b/firmware/development/engine_sniffer.cpp
@@ -38,7 +38,7 @@
 #define CHART_DELIMETER	'!'
 
 #if EFI_HISTOGRAMS
-#include "rfiutil.h"
+#include "os_util.h"
 #include "histogram.h"
 static histogram_s engineSnifferHisto;
 #endif /* EFI_HISTOGRAMS */
diff --git a/firmware/development/wave_analyzer.cpp b/firmware/development/wave_analyzer.cpp
index 45288f8026..c0b8f3ceba 100644
--- a/firmware/development/wave_analyzer.cpp
+++ b/firmware/development/wave_analyzer.cpp
@@ -21,7 +21,7 @@
 #include "signal_executor.h"
 #include "engine_configuration.h"
 #include "trigger_central.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "engine_math.h"
 #include "engine.h"
 #include "rpm_calculator.h"
diff --git a/firmware/hw_layer/drivers/gpio/tle6240.c b/firmware/hw_layer/drivers/gpio/tle6240.c
index e7e9b7b76e..0b939a3520 100644
--- a/firmware/hw_layer/drivers/gpio/tle6240.c
+++ b/firmware/hw_layer/drivers/gpio/tle6240.c
@@ -24,7 +24,7 @@
 #include "gpio/gpio_ext.h"
 #include "gpio/tle6240.h"
 #include "pin_repository.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 #if (BOARD_TLE6240_COUNT > 0)
 
diff --git a/firmware/hw_layer/drivers/gpio/tle8888.c b/firmware/hw_layer/drivers/gpio/tle8888.c
index 5bf648b6c2..9f29874738 100644
--- a/firmware/hw_layer/drivers/gpio/tle8888.c
+++ b/firmware/hw_layer/drivers/gpio/tle8888.c
@@ -38,7 +38,7 @@
 #include "hardware.h"
 #include "gpio/gpio_ext.h"
 #include "pin_repository.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 /* to be removed  */
 #if EFI_TUNER_STUDIO
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 58846606f8..3c24758635 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -17,7 +17,7 @@
 #include "can_hw.h"
 #include "hardware.h"
 #include "rtc_helper.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "injector_central.h"
 #include "vehicle_speed.h"
 #include "yaw_rate_sensor.h"
diff --git a/firmware/hw_layer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer.cpp
index 648e44564e..3d1e6374c4 100644
--- a/firmware/hw_layer/microsecond_timer.cpp
+++ b/firmware/hw_layer/microsecond_timer.cpp
@@ -15,7 +15,7 @@
 #include "os_access.h"
 #include "microsecond_timer.h"
 #include "scheduler.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 // https://my.st.com/public/STe2ecommunities/mcu/Lists/cortex_mx_stm32/Flat.aspx?RootFolder=https%3a%2f%2fmy.st.com%2fpublic%2fSTe2ecommunities%2fmcu%2fLists%2fcortex_mx_stm32%2fInterrupt%20on%20CEN%20bit%20setting%20in%20TIM7&FolderCTID=0x01200200770978C69A1141439FE559EB459D7580009C4E14902C3CDE46A77F0FFD06506F5B&currentviews=474
 
diff --git a/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp b/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
index 801da5f6a1..3445c77b5e 100644
--- a/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
+++ b/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
@@ -15,7 +15,7 @@
 #include "engine.h"
 #include "pin_repository.h"
 #include "stm32f4xx_hal_flash.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 EXTERN_ENGINE;
 
diff --git a/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp b/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
index c3ee164b9e..2df8e78024 100644
--- a/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
+++ b/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
@@ -12,7 +12,7 @@
 #include "engine.h"
 #include "pin_repository.h"
 #include "stm32f7xx_hal_flash.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 EXTERN_ENGINE;
 
diff --git a/firmware/hw_layer/rtc_helper.cpp b/firmware/hw_layer/rtc_helper.cpp
index 08690b7763..50f29c9f8c 100644
--- a/firmware/hw_layer/rtc_helper.cpp
+++ b/firmware/hw_layer/rtc_helper.cpp
@@ -10,7 +10,7 @@
 #include <time.h>
 #include "global.h"
 #include "os_access.h"
-#include "rfiutil.h"
+#include "os_util.h"
 #include "rtc_helper.h"
 
 #if EFI_RTC
diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp
index 86ebd191a7..b9a9bdd5f8 100644
--- a/firmware/util/datalogging.cpp
+++ b/firmware/util/datalogging.cpp
@@ -37,7 +37,7 @@
 #include "chmtx.h"
 #include "memstreams.h"
 #include "console_io.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 static MemoryStream intermediateLoggingBuffer;
 static uint8_t intermediateLoggingBufferData[INTERMEDIATE_LOGGING_BUFFER_SIZE] CCM_OPTIONAL;
diff --git a/firmware/util/rfiutil.c b/firmware/util/os_util.c
similarity index 75%
rename from firmware/util/rfiutil.c
rename to firmware/util/os_util.c
index 52340f1dc6..b741e31969 100644
--- a/firmware/util/rfiutil.c
+++ b/firmware/util/os_util.c
@@ -1,9 +1,9 @@
 /**
- * @file    rfiutil.c
- * @brief   Number to string conversion code
+ * @file    os_util.c
+ * @brief   Utility methods related to operating system usage
  *
  * @date Nov 15, 2012
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  *
  * This file is part of rusEfi - see http://rusefi.com
  *
@@ -19,44 +19,11 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
 #include "global.h"
 
-/*
- not used, not sure if we still need it. I guess we will remove it in 2015
- int mylog10(int param) {
- if (param < 10)
- return 0;
- if (param < 100)
- return 1;
- if (param < 1000)
- return 2;
- if (param < 10000)
- return 3;
- if (param < 100000)
- return 4;
- if (param < 1000000)
- return 5;
- if (param < 10000000)
- return 6;
- if (param < 100000000)
- return 7;
- #warning This would be better without recursion
- return mylog10(param / 10) + 1;
- }
- */
-/*
- char hexChar(int v) {
- v = v & 0xF;
- if (v < 10)
- return (char)('0' + v);
- return 'A' - 10 + v;
- }
- */
-
 #if !EFI_UNIT_TEST
 #include "os_access.h"
-#include "rfiutil.h"
+#include "os_util.h"
 
 void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
 	bool wasLocked = lockAnyContext();
diff --git a/firmware/util/rfiutil.h b/firmware/util/os_util.h
similarity index 100%
rename from firmware/util/rfiutil.h
rename to firmware/util/os_util.h
diff --git a/firmware/util/util.mk b/firmware/util/util.mk
index 43e94d91a6..5b47622abf 100644
--- a/firmware/util/util.mk
+++ b/firmware/util/util.mk
@@ -3,7 +3,7 @@ UTIL_DIR=$(PROJECT_DIR)/util
 UTILSRC = \
 	$(UTIL_DIR)/containers/data_buffer.c \
 	$(UTIL_DIR)/math/crc.c \
-	$(UTIL_DIR)/rfiutil.c \
+	$(UTIL_DIR)/os_util.c \
 	$(UTIL_DIR)/histogram.c
 
 UTILSRC_CPP = \