diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt
index 8a7336ac3a..27874daa39 100644
--- a/runtime/os_interface/linux/CMakeLists.txt
+++ b/runtime/os_interface/linux/CMakeLists.txt
@@ -21,7 +21,7 @@
 set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/allocator_helper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/api.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/api_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
@@ -52,8 +52,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time_linux.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
diff --git a/runtime/os_interface/linux/api.cpp b/runtime/os_interface/linux/api_linux.cpp
similarity index 100%
rename from runtime/os_interface/linux/api.cpp
rename to runtime/os_interface/linux/api_linux.cpp
diff --git a/runtime/os_interface/linux/drm_buffer_object.cpp b/runtime/os_interface/linux/drm_buffer_object.cpp
index b15851e73e..97c6c11410 100644
--- a/runtime/os_interface/linux/drm_buffer_object.cpp
+++ b/runtime/os_interface/linux/drm_buffer_object.cpp
@@ -25,7 +25,7 @@
 #include "runtime/os_interface/linux/drm_buffer_object.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"
-#include "runtime/os_interface/linux/os_time.h"
+#include "runtime/os_interface/linux/os_time_linux.h"
 #include "runtime/utilities/stackvec.h"
 
 #include <sys/syscall.h>
diff --git a/runtime/os_interface/linux/drm_null_device.h b/runtime/os_interface/linux/drm_null_device.h
index 89d5f8335f..f3498e6ef0 100644
--- a/runtime/os_interface/linux/drm_null_device.h
+++ b/runtime/os_interface/linux/drm_null_device.h
@@ -22,7 +22,7 @@
 
 #pragma once
 #include "runtime/os_interface/linux/drm_neo.h"
-#include "runtime/os_interface/linux/os_time.h"
+#include "runtime/os_interface/linux/os_time_linux.h"
 #include "drm/i915_drm.h"
 
 #include <cstdio>
diff --git a/runtime/os_interface/linux/os_time.cpp b/runtime/os_interface/linux/os_time_linux.cpp
similarity index 97%
rename from runtime/os_interface/linux/os_time.cpp
rename to runtime/os_interface/linux/os_time_linux.cpp
index 432237e8d3..bf0842bfd2 100644
--- a/runtime/os_interface/linux/os_time.cpp
+++ b/runtime/os_interface/linux/os_time_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "drm/i915_drm.h"
 #include "runtime/os_interface/linux/os_interface.h"
-#include "runtime/os_interface/linux/os_time.h"
+#include "runtime/os_interface/linux/os_time_linux.h"
 
 namespace OCLRT {
 
diff --git a/runtime/os_interface/linux/os_time.h b/runtime/os_interface/linux/os_time_linux.h
similarity index 97%
rename from runtime/os_interface/linux/os_time.h
rename to runtime/os_interface/linux/os_time_linux.h
index 6401957b72..e03ce20164 100644
--- a/runtime/os_interface/linux/os_time.h
+++ b/runtime/os_interface/linux/os_time_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt
index 6a95b1987c..39c9515bb9 100644
--- a/runtime/os_interface/windows/CMakeLists.txt
+++ b/runtime/os_interface/windows/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 
 set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/api.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/api_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d10_11_sharing_functions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
@@ -49,8 +49,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/os_socket.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
diff --git a/runtime/os_interface/windows/api.cpp b/runtime/os_interface/windows/api_win.cpp
similarity index 100%
rename from runtime/os_interface/windows/api.cpp
rename to runtime/os_interface/windows/api_win.cpp
diff --git a/runtime/os_interface/windows/os_time.cpp b/runtime/os_interface/windows/os_time_win.cpp
similarity index 98%
rename from runtime/os_interface/windows/os_time.cpp
rename to runtime/os_interface/windows/os_time_win.cpp
index c9a92b765b..27e22f377a 100644
--- a/runtime/os_interface/windows/os_time.cpp
+++ b/runtime/os_interface/windows/os_time_win.cpp
@@ -23,7 +23,7 @@
 #include <memory>
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/os_interface.h"
-#include "runtime/os_interface/windows/os_time.h"
+#include "runtime/os_interface/windows/os_time_win.h"
 
 #undef WIN32_NO_STATUS
 
diff --git a/runtime/os_interface/windows/os_time.h b/runtime/os_interface/windows/os_time_win.h
similarity index 98%
rename from runtime/os_interface/windows/os_time.h
rename to runtime/os_interface/windows/os_time_win.h
index 37e5b8d744..53a6655b4b 100644
--- a/runtime/os_interface/windows/os_time.h
+++ b/runtime/os_interface/windows/os_time_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/unit_tests/gen8/linux/hw_info_config_tests_gen8.cpp b/unit_tests/gen8/linux/hw_info_config_tests_gen8.cpp
index 7be1248ae1..a3a1777267 100644
--- a/unit_tests/gen8/linux/hw_info_config_tests_gen8.cpp
+++ b/unit_tests/gen8/linux/hw_info_config_tests_gen8.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "unit_tests/helpers/gtest_helpers.h"
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen8/windows/hw_info_config_tests_gen8.cpp b/unit_tests/gen8/windows/hw_info_config_tests_gen8.cpp
index b02601266d..8d946ed717 100644
--- a/unit_tests/gen8/windows/hw_info_config_tests_gen8.cpp
+++ b/unit_tests/gen8/windows/hw_info_config_tests_gen8.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp
index b62ba1f37b..a98a89703d 100644
--- a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp
+++ b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "unit_tests/helpers/gtest_helpers.h"
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp b/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp
index 0b649ff777..f75f573dd8 100644
--- a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp
+++ b/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
index a52330bc69..258d535b06 100644
--- a/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
+++ b/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "unit_tests/helpers/gtest_helpers.h"
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp b/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp
index 1f6aad5112..3fc7555eb1 100644
--- a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp
+++ b/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp b/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp
index 2939df53d0..b30128886d 100644
--- a/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp
+++ b/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "unit_tests/helpers/gtest_helpers.h"
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp b/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp
index e5244da306..1e59ffbb74 100644
--- a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp
+++ b/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
index 2f9befa1e1..b952bed964 100644
--- a/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
+++ b/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "unit_tests/helpers/gtest_helpers.h"
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp b/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp
index 75bce92b33..5b385a7378 100644
--- a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp
+++ b/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp b/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp
index 5c1205fa6c..2365b27151 100644
--- a/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp
+++ b/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "unit_tests/helpers/gtest_helpers.h"
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp b/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp
index eb17f075a1..131e075693 100644
--- a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp
+++ b/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "runtime/os_interface/windows/os_interface.h"
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 using namespace OCLRT;
 using namespace std;
diff --git a/unit_tests/gen9/windows/os_interface_tests_gen9.cpp b/unit_tests/gen9/windows/os_interface_tests_gen9.cpp
index 2375834f40..080e54345e 100644
--- a/unit_tests/gen9/windows/os_interface_tests_gen9.cpp
+++ b/unit_tests/gen9/windows/os_interface_tests_gen9.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "unit_tests/os_interface/windows/os_interface_tests.h"
+#include "unit_tests/os_interface/windows/os_interface_win_tests.h"
 #include "unit_tests/gen_common/test.h"
 
 typedef OsInterfaceTest OsInterfaceTestSkl;
diff --git a/unit_tests/mock_gdi/mock_gdi.cpp b/unit_tests/mock_gdi/mock_gdi.cpp
index 46b1483e5d..b5cd943e98 100644
--- a/unit_tests/mock_gdi/mock_gdi.cpp
+++ b/unit_tests/mock_gdi/mock_gdi.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "runtime/os_interface/windows/os_time.h"
+#include "runtime/os_interface/windows/os_time_win.h"
 #include "mock_gdi.h"
 
 ADAPTER_INFO gAdapterInfo = {0};
diff --git a/unit_tests/mocks/mock_ostime_win.h b/unit_tests/mocks/mock_ostime_win.h
index 80feffe603..8b34641078 100644
--- a/unit_tests/mocks/mock_ostime_win.h
+++ b/unit_tests/mocks/mock_ostime_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/windows/os_time.h"
+#include "runtime/os_interface/windows/os_time_win.h"
 
 namespace OCLRT {
 class MockOSTimeWin : public OSTimeWin {
diff --git a/unit_tests/os_interface/linux/CMakeLists.txt b/unit_tests/os_interface/linux/CMakeLists.txt
index c9f0c0fabc..57f62e76e3 100644
--- a/unit_tests/os_interface/linux/CMakeLists.txt
+++ b/unit_tests/os_interface/linux/CMakeLists.txt
@@ -35,12 +35,12 @@ set(IGDRCL_SRCS_tests_os_interface_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock.h
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo_create.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time_test.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_lin.cpp
diff --git a/unit_tests/os_interface/linux/hw_info_config_tests.cpp b/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp
similarity index 99%
rename from unit_tests/os_interface/linux/hw_info_config_tests.cpp
rename to unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp
index 81cc8df67f..6e5e70c9de 100644
--- a/unit_tests/os_interface/linux/hw_info_config_tests.cpp
+++ b/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp
@@ -24,7 +24,7 @@
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/linux/os_interface.h"
 
-#include "unit_tests/os_interface/linux/hw_info_config_tests.h"
+#include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h"
 #include "unit_tests/libult/mock_gfx_family.h"
 
 #include <cstring>
diff --git a/unit_tests/os_interface/linux/hw_info_config_tests.h b/unit_tests/os_interface/linux/hw_info_config_linux_tests.h
similarity index 100%
rename from unit_tests/os_interface/linux/hw_info_config_tests.h
rename to unit_tests/os_interface/linux/hw_info_config_linux_tests.h
diff --git a/unit_tests/os_interface/linux/mock_os_time_linux.h b/unit_tests/os_interface/linux/mock_os_time_linux.h
index 590eaebae1..a78dd54dc6 100644
--- a/unit_tests/os_interface/linux/mock_os_time_linux.h
+++ b/unit_tests/os_interface/linux/mock_os_time_linux.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
 */
 
 #pragma once
-#include "runtime/os_interface/linux/os_time.h"
+#include "runtime/os_interface/linux/os_time_linux.h"
 #include "runtime/os_interface/linux/os_interface.h"
 
 namespace OCLRT {
diff --git a/unit_tests/os_interface/linux/os_interface_tests.cpp b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp
similarity index 100%
rename from unit_tests/os_interface/linux/os_interface_tests.cpp
rename to unit_tests/os_interface/linux/os_interface_linux_tests.cpp
diff --git a/unit_tests/os_interface/linux/os_time_test.cpp b/unit_tests/os_interface/linux/os_time_test.cpp
index ad5674c14d..3a3c4ee65f 100644
--- a/unit_tests/os_interface/linux/os_time_test.cpp
+++ b/unit_tests/os_interface/linux/os_time_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,7 @@
 #include "test.h"
 #include "gtest/gtest.h"
 #include "runtime/os_interface/linux/os_interface.h"
-#include "runtime/os_interface/linux/os_time.h"
+#include "runtime/os_interface/linux/os_time_linux.h"
 
 #include <dlfcn.h>
 
diff --git a/unit_tests/os_interface/windows/CMakeLists.txt b/unit_tests/os_interface/windows/CMakeLists.txt
index 74525e00c3..33ca32c943 100644
--- a/unit_tests/os_interface/windows/CMakeLists.txt
+++ b/unit_tests/os_interface/windows/CMakeLists.txt
@@ -26,16 +26,16 @@ set(IGDRCL_SRCS_tests_os_interface_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_dll_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gdi_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_kmdaf_listener.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win_tests.cpp
diff --git a/unit_tests/os_interface/windows/hw_info_config_tests.cpp b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp
similarity index 97%
rename from unit_tests/os_interface/windows/hw_info_config_tests.cpp
rename to unit_tests/os_interface/windows/hw_info_config_win_tests.cpp
index 4c7fbe0dd1..1215624e44 100644
--- a/unit_tests/os_interface/windows/hw_info_config_tests.cpp
+++ b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "unit_tests/os_interface/windows/hw_info_config_tests.h"
+#include "unit_tests/os_interface/windows/hw_info_config_win_tests.h"
 
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
diff --git a/unit_tests/os_interface/windows/hw_info_config_tests.h b/unit_tests/os_interface/windows/hw_info_config_win_tests.h
similarity index 100%
rename from unit_tests/os_interface/windows/hw_info_config_tests.h
rename to unit_tests/os_interface/windows/hw_info_config_win_tests.h
diff --git a/unit_tests/os_interface/windows/mock_os_time_win.h b/unit_tests/os_interface/windows/mock_os_time_win.h
index 95f6a04b79..24c8b0773f 100644
--- a/unit_tests/os_interface/windows/mock_os_time_win.h
+++ b/unit_tests/os_interface/windows/mock_os_time_win.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017, Intel Corporation
+* Copyright (c) 2017 - 2018, Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
 */
 
 #pragma once
-#include "runtime/os_interface/windows/os_time.h"
+#include "runtime/os_interface/windows/os_time_win.h"
 
 namespace OCLRT {
 class MockOSTimeWin : public OSTimeWin {
diff --git a/unit_tests/os_interface/windows/os_interface_tests.cpp b/unit_tests/os_interface/windows/os_interface_win_tests.cpp
similarity index 96%
rename from unit_tests/os_interface/windows/os_interface_tests.cpp
rename to unit_tests/os_interface/windows/os_interface_win_tests.cpp
index a3f192ed00..33be33373b 100644
--- a/unit_tests/os_interface/windows/os_interface_tests.cpp
+++ b/unit_tests/os_interface/windows/os_interface_win_tests.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "unit_tests/os_interface/windows/os_interface_tests.h"
+#include "unit_tests/os_interface/windows/os_interface_win_tests.h"
 
 TEST_F(OsInterfaceTest, givenOsInterfaceWithoutWddmWhenGetHwContextIdIsCalledThenReturnsZero) {
     auto retVal = osInterface->getHwContextId();
diff --git a/unit_tests/os_interface/windows/os_interface_tests.h b/unit_tests/os_interface/windows/os_interface_win_tests.h
similarity index 100%
rename from unit_tests/os_interface/windows/os_interface_tests.h
rename to unit_tests/os_interface/windows/os_interface_win_tests.h
diff --git a/unit_tests/source_level_debugger/CMakeLists.txt b/unit_tests/source_level_debugger/CMakeLists.txt
index 04a1f54e0a..9db8b71ea6 100644
--- a/unit_tests/source_level_debugger/CMakeLists.txt
+++ b/unit_tests/source_level_debugger/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 set(IGDRCL_SRCS_tests_source_level_debugger
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_device_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_csr_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_preamble_test.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_preamble_test.inl
diff --git a/unit_tests/source_level_debugger/device_tests.cpp b/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp
similarity index 100%
rename from unit_tests/source_level_debugger/device_tests.cpp
rename to unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp