diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
index fb79a2f1578..dcda496be6c 100644
--- a/orchagent/aclorch.cpp
+++ b/orchagent/aclorch.cpp
@@ -2128,7 +2128,7 @@ void AclOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
index a38aa99a4b8..84f91b96fc6 100644
--- a/orchagent/copporch.cpp
+++ b/orchagent/copporch.cpp
@@ -589,7 +589,7 @@ void CoppOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/fdborch.cpp b/orchagent/fdborch.cpp
index 7498eb7e055..0c224fd0571 100644
--- a/orchagent/fdborch.cpp
+++ b/orchagent/fdborch.cpp
@@ -262,7 +262,7 @@ void FdbOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
@@ -342,7 +342,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/flexcounterorch.cpp b/orchagent/flexcounterorch.cpp
index 1e057bfb5b4..8493f6897a3 100644
--- a/orchagent/flexcounterorch.cpp
+++ b/orchagent/flexcounterorch.cpp
@@ -45,7 +45,7 @@ void FlexCounterOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/intfsorch.cpp b/orchagent/intfsorch.cpp
index d9946fa981f..75a78f3cec0 100644
--- a/orchagent/intfsorch.cpp
+++ b/orchagent/intfsorch.cpp
@@ -252,7 +252,7 @@ void IntfsOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/mirrororch.cpp b/orchagent/mirrororch.cpp
index 25b798603c9..ac6857ff4aa 100644
--- a/orchagent/mirrororch.cpp
+++ b/orchagent/mirrororch.cpp
@@ -968,7 +968,7 @@ void MirrorOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp
index 1eabb8e3aa0..f4168418008 100644
--- a/orchagent/neighorch.cpp
+++ b/orchagent/neighorch.cpp
@@ -275,7 +275,7 @@ void NeighOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
index de66476d501..70bd1caa455 100644
--- a/orchagent/orchdaemon.cpp
+++ b/orchagent/orchdaemon.cpp
@@ -179,7 +179,7 @@ bool OrchDaemon::init()
 
     /*
      * The order of the orch list is important for state restore of warm start and
-     * the queued processing in m_toSync map after gPortsOrch->isPortReady() is set.
+     * the queued processing in m_toSync map after gPortsOrch->allPortsReady() is set.
      *
      * For the multiple consumers in ports_tables, tasks for LAG_TABLE is processed before VLAN_TABLE
      * when iterating ConsumerMap.
diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
index 043ea64a03f..a36ed411e6b 100644
--- a/orchagent/pfcwdorch.cpp
+++ b/orchagent/pfcwdorch.cpp
@@ -53,7 +53,7 @@ void PfcWdOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/policerorch.cpp b/orchagent/policerorch.cpp
index 3aecf822c96..a5ddb1d7908 100644
--- a/orchagent/policerorch.cpp
+++ b/orchagent/policerorch.cpp
@@ -114,7 +114,7 @@ void PolicerOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index 5b1cdae88ac..45ad327ddea 100644
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -388,7 +388,7 @@ void PortsOrch::removeDefaultBridgePorts()
     SWSS_LOG_NOTICE("Remove bridge ports from default 1Q bridge");
 }
 
-bool PortsOrch::isPortReady()
+bool PortsOrch::allPortsReady()
 {
     return m_initDone && m_pendingPortSet.empty();
 }
@@ -2371,7 +2371,7 @@ void PortsOrch::doTask(Consumer &consumer)
     else
     {
         /* Wait for all ports to be initialized */
-        if (!isPortReady())
+        if (!allPortsReady())
         {
             return;
         }
@@ -3222,7 +3222,7 @@ void PortsOrch::doTask(NotificationConsumer &consumer)
     SWSS_LOG_ENTER();
 
     /* Wait for all ports to be initialized */
-    if (!isPortReady())
+    if (!allPortsReady())
     {
         return;
     }
diff --git a/orchagent/portsorch.h b/orchagent/portsorch.h
index a579e7f545b..d2819e62eaf 100644
--- a/orchagent/portsorch.h
+++ b/orchagent/portsorch.h
@@ -55,7 +55,7 @@ class PortsOrch : public Orch, public Subject
 public:
     PortsOrch(DBConnector *db, vector<table_name_with_pri_t> &tableNames);
 
-    bool isPortReady();
+    bool allPortsReady();
     bool isInitDone();
 
     map<string, Port>& getAllPorts();
diff --git a/orchagent/qosorch.cpp b/orchagent/qosorch.cpp
index 8859f8ef4bd..f804bd4dcb3 100644
--- a/orchagent/qosorch.cpp
+++ b/orchagent/qosorch.cpp
@@ -1386,7 +1386,7 @@ void QosOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
index 8187344e715..18b89977542 100644
--- a/orchagent/routeorch.cpp
+++ b/orchagent/routeorch.cpp
@@ -270,7 +270,7 @@ void RouteOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/tunneldecaporch.cpp b/orchagent/tunneldecaporch.cpp
index f056d5753f1..5c196a703aa 100644
--- a/orchagent/tunneldecaporch.cpp
+++ b/orchagent/tunneldecaporch.cpp
@@ -21,7 +21,7 @@ void TunnelDecapOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/watermarkorch.cpp b/orchagent/watermarkorch.cpp
index 0cf746dcd48..25eb2282304 100644
--- a/orchagent/watermarkorch.cpp
+++ b/orchagent/watermarkorch.cpp
@@ -50,7 +50,7 @@ void WatermarkOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
@@ -141,7 +141,7 @@ void WatermarkOrch::handleFcConfigUpdate(const std::string &key, const std::vect
 void WatermarkOrch::doTask(NotificationConsumer &consumer)
 {
     SWSS_LOG_ENTER();
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }