diff --git a/src/inet/IPAddress.cpp b/src/inet/IPAddress.cpp
index 5cd0c2d87490e0..a1056e8abbbd8a 100644
--- a/src/inet/IPAddress.cpp
+++ b/src/inet/IPAddress.cpp
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This file implements the class <tt>Inet::IPAddress</tt> and
- *      related enumerated constants. The Nest Inet Layer uses objects
+ *      related enumerated constants. The CHIP Inet Layer uses objects
  *      of this class to represent Internet protocol addresses of both
  *      IPv4 and IPv6 address families. (IPv4 addresses are stored
  *      internally in the V4COMPAT format, reserved for that purpose.)
diff --git a/src/inet/IPAddress.h b/src/inet/IPAddress.h
index 4c5e29b8768a9e..f942be1a8ff391 100644
--- a/src/inet/IPAddress.h
+++ b/src/inet/IPAddress.h
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This file defines the class <tt>Inet::IPAddress</tt> and
- *      related enumerated constants. The Nest Inet Layer uses objects
+ *      related enumerated constants. The CHIP Inet Layer uses objects
  *      of this class to represent Internet protocol addresses of both
  *      IPv4 and IPv6 address families. (IPv4 addresses are stored
  *      internally in the V4COMPAT format, reserved for that purpose.)
@@ -119,7 +119,7 @@ typedef enum
  * @brief   Internet protocol address
  *
  * @details
- *  The Nest Inet Layer uses objects of this class to represent Internet
+ *  The CHIP Inet Layer uses objects of this class to represent Internet
  *  protocol addresses (independent of protocol version).
  */
 class DLL_EXPORT IPAddress
@@ -654,7 +654,7 @@ class DLL_EXPORT IPAddress
      *
      * @details
      *  This object is used as a constant for equivalence comparisons. It must
-     *  not be modified by users of the Nest Inet Layer.
+     *  not be modified by users of the CHIP Inet Layer.
      */
     static IPAddress Any;
 };
diff --git a/src/inet/IPPrefix.cpp b/src/inet/IPPrefix.cpp
index d35b1e7cebc9ef..971141b78709d8 100644
--- a/src/inet/IPPrefix.cpp
+++ b/src/inet/IPPrefix.cpp
@@ -19,7 +19,7 @@
  *    @file
  *      This file implements the concrete class
  *      <tt>Inet::IPPrefix</tt>, which comprise two member fields:
- *      a) a IP address and b) a length field. The Nest Inet Layer
+ *      a) a IP address and b) a length field. The CHIP Inet Layer
  *      uses objects of this class to represent Internet protocol
  *      address prefixes of both IPv4 and IPv6 address families.
  *
diff --git a/src/inet/IPPrefix.h b/src/inet/IPPrefix.h
index 49c1dcdc25a099..a86449308aa0ec 100644
--- a/src/inet/IPPrefix.h
+++ b/src/inet/IPPrefix.h
@@ -19,7 +19,7 @@
  *    @file
  *      This file defines the concrete class
  *      <tt>Inet::IPPrefix</tt>, which comprise two member fields:
- *      a) a IP address and b) a length field. The Nest Inet Layer
+ *      a) a IP address and b) a length field. The CHIP Inet Layer
  *      uses objects of this class to represent Internet protocol
  *      address prefixes of both IPv4 and IPv6 address families.
  */
diff --git a/src/inet/InetConfig.h b/src/inet/InetConfig.h
index 8044e10f08e6f0..f02c7d5b1a90d0 100644
--- a/src/inet/InetConfig.h
+++ b/src/inet/InetConfig.h
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This file defines default compile-time configuration constants
- *      for the Nest InetLayer, an Internet Protocol communications
+ *      for the CHIP InetLayer, an Internet Protocol communications
  *      abstraction layer.
  *
  *      Package integrators that wish to override these values should
diff --git a/src/inet/InetError.h b/src/inet/InetError.h
index a6e1a1b78433be..120f40af7b263e 100644
--- a/src/inet/InetError.h
+++ b/src/inet/InetError.h
@@ -17,7 +17,7 @@
 
 /**
  *    @file
- *      This file defines constants for the Nest InetLayer subsystem.
+ *      This file defines constants for the CHIP InetLayer subsystem.
  *
  *      Error types, ranges, and mappings overrides may be made by
  *      defining the appropriate INET_CONFIG_* or _INET_CONFIG_*
diff --git a/src/inet/RawEndPoint.cpp b/src/inet/RawEndPoint.cpp
index 04ea54c7df20b4..90c50ee60e3c16 100644
--- a/src/inet/RawEndPoint.cpp
+++ b/src/inet/RawEndPoint.cpp
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This file implements the <tt>Inet::RawEndPoint</tt> class,
- *      where the Nest Inet Layer encapsulates methods for interacting
+ *      where the CHIP Inet Layer encapsulates methods for interacting
  *      interacting with IP network endpoints (SOCK_RAW sockets
  *      on Linux and BSD-derived systems) or LwIP raw protocol
  *      control blocks, as the system is configured accordingly.
diff --git a/src/inet/RawEndPoint.h b/src/inet/RawEndPoint.h
index 0615b2e8fdba31..cb8c4bfd4f4a83 100644
--- a/src/inet/RawEndPoint.h
+++ b/src/inet/RawEndPoint.h
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This header file defines the <tt>Inet::RawEndPoint</tt>
- *      class, where the Nest Inet Layer encapsulates methods for
+ *      class, where the CHIP Inet Layer encapsulates methods for
  *      interacting with IP network endpoints (SOCK_RAW sockets
  *      on Linux and BSD-derived systems) or LwIP raw protocol
  *      control blocks, as the system is configured accordingly.
@@ -42,7 +42,7 @@ class IPPacketInfo;
  * @brief   Objects of this class represent raw IP network endpoints.
  *
  * @details
- *  Nest Inet Layer encapsulates methods for interacting with IP network
+ *  CHIP Inet Layer encapsulates methods for interacting with IP network
  *  endpoints (SOCK_RAW sockets on Linux and BSD-derived systems) or LwIP
  *  raw protocol control blocks, as the system is configured accordingly.
  */
diff --git a/src/inet/TCPEndPoint.cpp b/src/inet/TCPEndPoint.cpp
index 3e550972208612..57702d3ab99210 100644
--- a/src/inet/TCPEndPoint.cpp
+++ b/src/inet/TCPEndPoint.cpp
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This file implements the <tt>Inet::TCPEndPoint</tt> class,
- *      where the Nest Inet Layer encapsulates methods for interacting
+ *      where the CHIP Inet Layer encapsulates methods for interacting
  *      with TCP transport endpoints (SOCK_DGRAM sockets on Linux and
  *      BSD-derived systems) or LwIP TCP protocol control blocks, as
  *      the system is configured accordingly.
diff --git a/src/inet/TCPEndPoint.h b/src/inet/TCPEndPoint.h
index 3361375efaa65a..c7571db8322ce2 100644
--- a/src/inet/TCPEndPoint.h
+++ b/src/inet/TCPEndPoint.h
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This header file defines the <tt>Inet::TCPEndPoint</tt>
- *      class, where the Nest Inet Layer encapsulates methods for
+ *      class, where the CHIP Inet Layer encapsulates methods for
  *      interacting with TCP transport endpoints (SOCK_DGRAM sockets
  *      on Linux and BSD-derived systems) or LwIP TCP protocol
  *      control blocks, as the system is configured accordingly.
@@ -41,7 +41,7 @@ class InetLayer;
  * @brief   Objects of this class represent TCP transport endpoints.
  *
  * @details
- *  Nest Inet Layer encapsulates methods for interacting with TCP transport
+ *  CHIP Inet Layer encapsulates methods for interacting with TCP transport
  *  endpoints (SOCK_STREAM sockets on Linux and BSD-derived systems) or LwIP
  *  TCP protocol control blocks, as the system is configured accordingly.
  */
diff --git a/src/inet/TunEndPoint.h b/src/inet/TunEndPoint.h
index db95f4f3591d30..5cb7faddc78eba 100644
--- a/src/inet/TunEndPoint.h
+++ b/src/inet/TunEndPoint.h
@@ -18,7 +18,7 @@
 /**
  * @file
  *  This header file defines the <tt>Inet::TunEndPoint</tt> class, where
- *  the Nest Inet Layer encapsulates its foundational logic for the chip
+ *  the CHIP Inet Layer encapsulates its foundational logic for the chip
  *  tunneling agent.
  */
 
@@ -90,7 +90,7 @@ class IPPacketInfo;
  * @brief   Objects of this class represent tunnel interfaces.
  *
  * @details
- *  Nest Inet Layer encapsulates methods for interacting on both POSIX systems
+ *  CHIP Inet Layer encapsulates methods for interacting on both POSIX systems
  *  and LwIP systems with an IP-in-IP tunneling mechanism for supporting the
  *  chip tunnel agent.
  */
diff --git a/src/inet/UDPEndPoint.cpp b/src/inet/UDPEndPoint.cpp
index ed55a706aee5f4..bb9339a8810e75 100644
--- a/src/inet/UDPEndPoint.cpp
+++ b/src/inet/UDPEndPoint.cpp
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This file implements the <tt>Inet::UDPEndPoint</tt>
- *      class, where the Nest Inet Layer encapsulates methods for
+ *      class, where the CHIP Inet Layer encapsulates methods for
  *      interacting with UDP transport endpoints (SOCK_DGRAM sockets
  *      on Linux and BSD-derived systems) or LwIP UDP protocol
  *      control blocks, as the system is configured accordingly.
diff --git a/src/inet/UDPEndPoint.h b/src/inet/UDPEndPoint.h
index 63e6af7a7b3259..c5f83d289013c8 100644
--- a/src/inet/UDPEndPoint.h
+++ b/src/inet/UDPEndPoint.h
@@ -18,7 +18,7 @@
 /**
  *    @file
  *      This header file defines the <tt>Inet::UDPEndPoint</tt>
- *      class, where the Nest Inet Layer encapsulates methods for
+ *      class, where the CHIP Inet Layer encapsulates methods for
  *      interacting with UDP transport endpoints (SOCK_DGRAM sockets
  *      on Linux and BSD-derived systems) or LwIP UDP protocol
  *      control blocks, as the system is configured accordingly.
@@ -42,7 +42,7 @@ class IPPacketInfo;
  * @brief   Objects of this class represent UDP transport endpoints.
  *
  * @details
- *  Nest Inet Layer encapsulates methods for interacting with UDP transport
+ *  CHIP Inet Layer encapsulates methods for interacting with UDP transport
  *  endpoints (SOCK_DGRAM sockets on Linux and BSD-derived systems) or LwIP
  *  UDP protocol control blocks, as the system is configured accordingly.
  */