diff --git a/CompositeInput/cmake/FindIARMBus.cmake b/CompositeInput/cmake/FindIARMBus.cmake
index bc716bcd9e..d74cb6aba1 100644
--- a/CompositeInput/cmake/FindIARMBus.cmake
+++ b/CompositeInput/cmake/FindIARMBus.cmake
@@ -26,7 +26,7 @@
 find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
-find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
+find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
 set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${SYSMGR_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS../sysmgr} )
diff --git a/DisplaySettings/cmake/FindIARMBus.cmake b/DisplaySettings/cmake/FindIARMBus.cmake
index 9764ced5ea..9ebfb8765e 100644
--- a/DisplaySettings/cmake/FindIARMBus.cmake
+++ b/DisplaySettings/cmake/FindIARMBus.cmake
@@ -27,7 +27,7 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
+find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
 set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS})
diff --git a/HdmiInput/cmake/FindIARMBus.cmake b/HdmiInput/cmake/FindIARMBus.cmake
index bc716bcd9e..d74cb6aba1 100644
--- a/HdmiInput/cmake/FindIARMBus.cmake
+++ b/HdmiInput/cmake/FindIARMBus.cmake
@@ -26,7 +26,7 @@
 find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
-find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
+find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
 set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${SYSMGR_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS../sysmgr} )
diff --git a/MaintenanceManager/cmake/FindIARMBus.cmake b/MaintenanceManager/cmake/FindIARMBus.cmake
index 2b60f4e31f..ca60e74031 100644
--- a/MaintenanceManager/cmake/FindIARMBus.cmake
+++ b/MaintenanceManager/cmake/FindIARMBus.cmake
@@ -27,8 +27,8 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
-find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
+find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
+find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 
diff --git a/SystemServices/cmake/FindIARMBus.cmake b/SystemServices/cmake/FindIARMBus.cmake
index d18eb98042..e5fafcef53 100644
--- a/SystemServices/cmake/FindIARMBus.cmake
+++ b/SystemServices/cmake/FindIARMBus.cmake
@@ -27,8 +27,8 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
-find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
+find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
+find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 
diff --git a/Warehouse/cmake/FindIARMBus.cmake b/Warehouse/cmake/FindIARMBus.cmake
index e6ee482545..634a9c43be 100644
--- a/Warehouse/cmake/FindIARMBus.cmake
+++ b/Warehouse/cmake/FindIARMBus.cmake
@@ -27,8 +27,8 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 #find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-#find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
-find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
+#find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
+find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
diff --git a/cmake/FindIARMBus.cmake b/cmake/FindIARMBus.cmake
index aecd12a945..a8d5384606 100644
--- a/cmake/FindIARMBus.cmake
+++ b/cmake/FindIARMBus.cmake
@@ -27,7 +27,7 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
+find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")