diff --git a/tt_metal/programming_examples/profiler/test_timestamped_events/test_timestamped_events.cpp b/tt_metal/programming_examples/profiler/test_timestamped_events/test_timestamped_events.cpp
index fcef6d3052c..a21780f18b2 100644
--- a/tt_metal/programming_examples/profiler/test_timestamped_events/test_timestamped_events.cpp
+++ b/tt_metal/programming_examples/profiler/test_timestamped_events/test_timestamped_events.cpp
@@ -9,7 +9,7 @@
 
 using namespace tt;
 
-void RunFillUpAllBuffers(tt_metal::Device* device, int loop_count, bool fast_dispatch) {
+void RunFillUpAllBuffers(tt_metal::IDevice* device, int loop_count, bool fast_dispatch) {
     CoreCoord compute_with_storage_size = device->compute_with_storage_grid_size();
     CoreCoord start_core = {0, 0};
     CoreCoord end_core = {compute_with_storage_size.x - 1, compute_with_storage_size.y - 1};
@@ -72,7 +72,7 @@ int main(int argc, char** argv) {
         //                      Device Setup
         ////////////////////////////////////////////////////////////////////////////
         int device_id = 0;
-        tt_metal::Device* device = tt_metal::CreateDevice(device_id);
+        tt_metal::IDevice* device = tt_metal::CreateDevice(device_id);
 
         const auto USE_FAST_DISPATCH = std::getenv("TT_METAL_SLOW_DISPATCH_MODE") == nullptr;
 
diff --git a/tt_metal/tools/profiler/profiler.cpp b/tt_metal/tools/profiler/profiler.cpp
index ce39beca65d..4c1388e40ce 100644
--- a/tt_metal/tools/profiler/profiler.cpp
+++ b/tt_metal/tools/profiler/profiler.cpp
@@ -386,7 +386,7 @@ void DeviceProfiler::generateZoneSourceLocationsHashes() {
 }
 
 void DeviceProfiler::dumpJsonReport(
-    Device* device, const std::vector<std::uint32_t>& profile_buffer, const std::vector<CoreCoord>& worker_cores) {
+    IDevice* device, const std::vector<std::uint32_t>& profile_buffer, const std::vector<CoreCoord>& worker_cores) {
     auto device_id = device->id();
 
     // determine rpt filepath
@@ -609,7 +609,7 @@ void DeviceProfiler::dumpJsonReport(
     json_rpt_os.close();
 }
 
-void DeviceProfiler::dumpResults(Device* device, const std::vector<CoreCoord>& worker_cores, bool lastDump) {
+void DeviceProfiler::dumpResults(IDevice* device, const std::vector<CoreCoord>& worker_cores, bool lastDump) {
 #if defined(TRACY_ENABLE)
     ZoneScoped;
 
diff --git a/tt_metal/tools/profiler/profiler.hpp b/tt_metal/tools/profiler/profiler.hpp
index 49e809b98e5..103cdd29cdc 100644
--- a/tt_metal/tools/profiler/profiler.hpp
+++ b/tt_metal/tools/profiler/profiler.hpp
@@ -108,11 +108,11 @@ class DeviceProfiler {
     void setOutputDir(const std::string& new_output_dir);
 
     // Traverse all cores on the device and dump the device profile results
-    void dumpResults(Device* device, const std::vector<CoreCoord>& worker_cores, bool lastDump);
+    void dumpResults(IDevice* device, const std::vector<CoreCoord>& worker_cores, bool lastDump);
 
     // Traverse all cores, producing json report with noc events
     void dumpJsonReport(
-        Device* device, const std::vector<std::uint32_t>& profile_buffer, const std::vector<CoreCoord>& worker_cores);
+        IDevice* device, const std::vector<std::uint32_t>& profile_buffer, const std::vector<CoreCoord>& worker_cores);
 };
 
 }  // namespace tt_metal