docs: update chip name to Matter and misc edits (#10561)
* doc: update CHIP name on intro pages
Update CHIP to Matter in top-level readme and contributing.md.
Signed-off-by: Grzegorz Ferenc <Grzegorz.Ferenc@nordicsemi.no>
* doc: update CHIP name in generic examples
Updated CHIP to Matter in non-nrfconnect generic examples.
Signed-off-by: Grzegorz Ferenc <Grzegorz.Ferenc@nordicsemi.no>
* doc: update CHIP name on nrfconnect pages
Updated CHIP to Matter on nrfconnect pages.
Signed-off-by: Grzegorz Ferenc <Grzegorz.Ferenc@nordicsemi.no>
* doc: update CHIP name in tool guides
Updated CHIP to Matter in tool guides.
Updated structure of the Android guide.
Signed-off-by: Grzegorz Ferenc <Grzegorz.Ferenc@nordicsemi.no>
* doc: update CHIP name in docs/ files
Changed CHIP to Matter in md files in docs/.
Signed-off-by: Grzegorz Ferenc <Grzegorz.Ferenc@nordicsemi.no>
* Restyled by prettier-markdown
* wordlist: add CSA term
Updated .wordlist with CSA.
Signed-off-by: Grzegorz Ferenc <Grzegorz.Ferenc@nordicsemi.no>
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/chip-tool/README.md b/examples/chip-tool/README.md
index 699e83e..9e22fc3 100644
--- a/examples/chip-tool/README.md
+++ b/examples/chip-tool/README.md
@@ -1,10 +1,9 @@
-# CHIP Client Example
+# Matter Client Example
-An example application that uses CHIP to send messages to a CHIP server.
+An example application that uses Matter to send messages to a Matter server.
---
-- [CHIP Client Example](#chip-client-example)
- [Building the Example Application](#building-the-example-application)
- [Using the Client to Request an Echo](#using-the-client-to-request-an-echo)
@@ -97,9 +96,9 @@
$ chip-tool pairing unpair
-## Using the Client to Send CHIP Commands
+## Using the Client to Send Matter Commands
-To use the Client to send a CHIP commands, run the built executable and pass it
+To use the Client to send Matter commands, run the built executable and pass it
the target cluster name, the target command name as well as an endpoint id.
The endpoint id must be between 1 and 240.
diff --git a/examples/lighting-app/nrfconnect/README.md b/examples/lighting-app/nrfconnect/README.md
index 578acdd..1cdc8c2 100644
--- a/examples/lighting-app/nrfconnect/README.md
+++ b/examples/lighting-app/nrfconnect/README.md
@@ -1,4 +1,4 @@
-# CHIP nRF Connect Lighting Example Application
+# Matter nRF Connect Lighting Example Application
The nRF Connect Lighting Example demonstrates how to remotely control a white
dimmable light bulb. It uses buttons to test changing the lighting and device
@@ -10,12 +10,13 @@
<img src="../../platform/nrfconnect/doc/images/nRF52840-DK-small.png" alt="nRF52840 DK">
</p>
-The example is based on [CHIP](https://github.com/project-chip/connectedhomeip)
-and Nordic Semiconductor's nRF Connect SDK, and supports remote access and
-control of a lighting over a low-power, 802.15.4 Thread network.
+The example is based on
+[Matter](https://github.com/project-chip/connectedhomeip) and Nordic
+Semiconductor's nRF Connect SDK, and supports remote access and control of a
+lighting over a low-power, 802.15.4 Thread network.
-The example behaves as a CHIP accessory, that is a device that can be paired
-into an existing CHIP network and can be controlled by this network.
+The example behaves as a Matter accessory, that is a device that can be paired
+into an existing Matter network and can be controlled by this network.
<hr>
@@ -51,19 +52,19 @@
This example is running on the nRF Connect platform, which is based on Nordic
Semiconductor's
[nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
-and [Zephyr RTOS](https://zephyrproject.org/). Visit CHIP's
+and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
to read more about the platform structure and dependencies.
-The CHIP device that runs the lighting application is controlled by the CHIP
-controller device over the Thread protocol. By default, the CHIP device has
-Thread disabled, and it should be paired with CHIP controller and get
+The Matter device that runs the lighting application is controlled by the Matter
+controller device over the Thread protocol. By default, the Matter device has
+Thread disabled, and it should be paired with Matter controller and get
configuration from it. Some actions required before establishing full
communication are described below.
The example also comes with a test mode, which allows to start Thread with the
default settings by pressing button manually. However, this mode does not
-guarantee that the device will be able to communicate with the CHIP controller
+guarantee that the device will be able to communicate with the Matter controller
and other devices.
The example can be configured to use the secure bootloader and utilize it for
@@ -71,18 +72,19 @@
### Bluetooth LE advertising
-To commission the device onto a CHIP network, the device must be discoverable
+To commission the device onto a Matter network, the device must be discoverable
over Bluetooth LE that starts automatically upon the device startup, but only
for a predefined period of time (15 minutes by default). If the Bluetooth LE
advertising times out, you can re-enable it manually using **Button 4**.
### Bluetooth LE rendezvous
-In CHIP, the commissioning procedure is done over Bluetooth LE between a CHIP
-device and the CHIP controller, where the controller has the commissioner role.
+In Matter, the commissioning procedure is done over Bluetooth LE between a
+Matter device and the Matter controller, where the controller has the
+commissioner role.
To start the rendezvous, the controller must get the commissioning information
-from the CHIP device. The data payload is encoded within a QR code, printed to
+from the Matter device. The data payload is encoded within a QR code, printed to
the UART console, and shared using an NFC tag. NFC tag emulation starts
automatically when Bluetooth LE advertising is started and stays enabled until
Bluetooth LE advertising timeout expires.
@@ -90,15 +92,15 @@
#### Thread provisioning
Last part of the rendezvous procedure, the provisioning operation involves
-sending the Thread network credentials from the CHIP controller to the CHIP
+sending the Thread network credentials from the Matter controller to the Matter
device. As a result, device is able to join the Thread network and communicate
with other Thread devices in the network.
### Device Firmware Upgrade
The example allows enabling the over-the-air Device Firmware Upgrade feature. In
-this process, the device hosting new firmware image sends the image to the CHIP
-device using Bluetooth LE transport and
+this process, the device hosting new firmware image sends the image to the
+Matter device using Bluetooth LE transport and
[Simple Management Protocol](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/device_mgmt/index.html#device-mgmt).
The
[MCUboot](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/mcuboot/index.html)
@@ -228,13 +230,14 @@
**NFC port with antenna attached** can be used to start the
[rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
-information from the CHIP device in a data payload that can be shared using NFC.
+information from the Matter device in a data payload that can be shared using
+NFC.
<hr>
## Setting up the environment
-Before building the example, check out the CHIP repository and sync submodules
+Before building the example, check out the Matter repository and sync submodules
using the following command:
$ git submodule update --init
@@ -272,7 +275,7 @@
- _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
SDK source directory.
- - _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
+ - _~/connectedhomeip_ must be replaced with an absolute path to the Matter
source directory.
- _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
parameters can be omitted if you are not planning to flash the example
@@ -309,20 +312,20 @@
If you have the SDK already installed, continue to the next step and update
the nRF Connect SDK after initializing environment variables.
-3. Initialize environment variables referred to by the CHIP and the nRF Connect
- SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
- Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
- Arm Embedded Toolchain.
+3. Initialize environment variables referred to by the Matter and the nRF
+ Connect SDK build scripts. Replace _nrfconnect-dir_ with the path to your
+ nRF Connect SDK installation directory, and _toolchain-dir_ with the path to
+ GNU Arm Embedded Toolchain.
$ source nrfconnect-dir/zephyr/zephyr-env.sh
$ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
$ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
4. Update the nRF Connect SDK to the most recent supported revision by running
- the following command (replace _chip-dir_ with the path to CHIP repository
- directory):
+ the following command (replace _matter-dir_ with the path to Matter
+ repository directory):
- $ cd chip-dir
+ $ cd matter-dir
$ python3 scripts/setup/nrfconnect/update_ncs.py --update
Now you can proceed with the [Building](#building) instruction.
@@ -501,7 +504,7 @@
[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
to see how to use [CHIPTool](../../../src/android/CHIPTool/README.md) for
Android smartphones to commission and control the application within a
-CHIP-enabled Thread network.
+Matter-enabled Thread network.
### Testing Device Firmware Upgrade
diff --git a/examples/lock-app/nrfconnect/README.md b/examples/lock-app/nrfconnect/README.md
index 4fb0929..5e783e7 100644
--- a/examples/lock-app/nrfconnect/README.md
+++ b/examples/lock-app/nrfconnect/README.md
@@ -1,4 +1,4 @@
-# CHIP nRF Connect Lock Example Application
+# Matter nRF Connect Lock Example Application
The nRF Connect Lock Example demonstrates how to remotely control a door lock
device with one basic bolt. It uses buttons to test changing the lock and device
@@ -10,12 +10,13 @@
<img src="../../platform/nrfconnect/doc/images/nRF52840-DK-small.png" alt="nRF52840 DK">
</p>
-The example is based on [CHIP](https://github.com/project-chip/connectedhomeip)
-and Nordic Semiconductor's nRF Connect SDK, and supports remote access and
-control of a simulated door lock over a low-power, 802.15.4 Thread network.
+The example is based on
+[Matter](https://github.com/project-chip/connectedhomeip) and Nordic
+Semiconductor's nRF Connect SDK, and supports remote access and control of a
+simulated door lock over a low-power, 802.15.4 Thread network.
-The example behaves as a CHIP accessory, that is a device that can be paired
-into an existing CHIP network and can be controlled by this network.
+The example behaves as a Matter accessory, that is a device that can be paired
+into an existing Matter network and can be controlled by this network.
<hr>
@@ -48,19 +49,19 @@
This example is running on the nRF Connect platform, which is based on Nordic
Semiconductor's
[nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
-and [Zephyr RTOS](https://zephyrproject.org/). Visit CHIP's
+and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
to read more about the platform structure and dependencies.
-The CHIP device that runs the lock application is controlled by the CHIP
-controller device over the Thread protocol. By default, the CHIP device has
-Thread disabled, and it should be paired with CHIP controller and get
+The Matter device that runs the lock application is controlled by the Matter
+controller device over the Thread protocol. By default, the Matter device has
+Thread disabled, and it should be paired with Matter controller and get
configuration from it. Some actions required before establishing full
communication are described below.
The example also comes with a test mode, which allows to start Thread with the
default settings by pressing button manually. However, this mode does not
-guarantee that the device will be able to communicate with the CHIP controller
+guarantee that the device will be able to communicate with the Matter controller
and other devices.
The example can be configured to use the secure bootloader and utilize it for
@@ -68,18 +69,18 @@
### Bluetooth LE advertising
-In this example, to commission the device onto a CHIP network, it must be
+In this example, to commission the device onto a Matter network, it must be
discoverable over Bluetooth LE. For security reasons, you must start Bluetooth
LE advertising manually after powering up the device by pressing **Button 4**.
### Bluetooth LE rendezvous
In this example, the commissioning procedure is done over Bluetooth LE between a
-CHIP device and the CHIP controller, where the controller has the commissioner
-role.
+Matter device and the Matter controller, where the controller has the
+commissioner role.
To start the rendezvous, the controller must get the commissioning information
-from the CHIP device. The data payload is encoded within a QR code, printed to
+from the Matter device. The data payload is encoded within a QR code, printed to
the UART console, and shared using an NFC tag. NFC tag emulation starts
automatically when Bluetooth LE advertising is started and stays enabled until
Bluetooth LE advertising timeout expires.
@@ -87,15 +88,15 @@
#### Thread provisioning
Last part of the rendezvous procedure, the provisioning operation involves
-sending the Thread network credentials from the CHIP controller to the CHIP
+sending the Thread network credentials from the Matter controller to the Matter
device. As a result, device is able to join the Thread network and communicate
with other Thread devices in the network.
### Device Firmware Upgrade
The example allows enabling the over-the-air Device Firmware Upgrade feature. In
-this process, the device hosting new firmware image sends the image to the CHIP
-device using Bluetooth LE transport and
+this process, the device hosting new firmware image sends the image to the
+Matter device using Bluetooth LE transport and
[Simple Management Protocol](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/device_mgmt/index.html#device-mgmt).
The
[MCUboot](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/mcuboot/index.html)
@@ -122,8 +123,8 @@
device management purposes, including application image management. SMP supports
using different transports, such as Bluetooth LE, UDP, or serial USB/UART.
-In this example, the CHIP device runs the SMP Server to download the application
-update image using the Bluetooth LE transport.
+In this example, the Matter device runs the SMP Server to download the
+application update image using the Bluetooth LE transport.
See the
[Building with Device Firmware Upgrade support](#building-with-device-firmware-upgrade-support)
@@ -218,13 +219,14 @@
**NFC port with antenna attached** can be used to start the
[rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
-information from the CHIP device in a data payload that can be shared using NFC.
+information from the Matter device in a data payload that can be shared using
+NFC.
<hr>
## Setting up the environment
-Before building the example, check out the CHIP repository and sync submodules
+Before building the example, check out the Matter repository and sync submodules
using the following command:
$ git submodule update --init
@@ -309,10 +311,10 @@
$ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
4. Update the nRF Connect SDK to the most recent supported revision by running
- the following command (replace _chip-dir_ with the path to CHIP repository
- directory):
+ the following command (replace _matter-dir_ with the path to Matter
+ repository directory):
- $ cd chip-dir
+ $ cd matter-dir
$ python3 scripts/setup/nrfconnect/update_ncs.py --update
Now you can proceed with the [Building](#building) instruction.
@@ -466,7 +468,7 @@
[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
to see how to use [CHIPTool](../../../src/android/CHIPTool/README.md) for
Android smartphones to commission and control the application within a
-CHIP-enabled Thread network.
+Matter-enabled Thread network.
### Testing Device Firmware Upgrade
diff --git a/examples/pigweed-app/nrfconnect/README.md b/examples/pigweed-app/nrfconnect/README.md
index ad88dbd..a66f536 100644
--- a/examples/pigweed-app/nrfconnect/README.md
+++ b/examples/pigweed-app/nrfconnect/README.md
@@ -1,4 +1,4 @@
-# CHIP nRF Connect Pigweed Example Application
+# Matter nRF Connect Pigweed Example Application
The nRF Connect Pigweed Example demonstrates the usage of Pigweed module
functionalities in an application.
@@ -8,17 +8,18 @@
<img src="../../platform/nrfconnect/doc/images/nRF52840-DK-small.png" alt="nRF52840 DK">
</p>
-The example is based on [CHIP](https://github.com/project-chip/connectedhomeip),
-the [Pigweed](https://pigweed.googlesource.com/pigweed/pigweed) module, which is
-a collection of libraries that provide different functionalities for embedded
+The example is based on
+[Matter](https://github.com/project-chip/connectedhomeip), the
+[Pigweed](https://pigweed.googlesource.com/pigweed/pigweed) module, which is a
+collection of libraries that provide different functionalities for embedded
systems, and Nordic Semiconductor's nRF Connect SDK.
You can use this example as a training ground for making experiments, testing
Pigweed module features and checking what actions are necessary to fully
-integrate Pigweed in a CHIP project.
+integrate Pigweed in a Matter project.
-Pigweed functionalities are being gradually integrated into CHIP. Currently, the
-following features are available:
+Pigweed functionalities are being gradually integrated into Matter. Currently,
+the following features are available:
- **Echo RPC** - Creates a Remote Procedure Call server and allows sending
commands through the serial port to the device, which makes echo and sends
@@ -48,12 +49,12 @@
This example is running on the nRF Connect platform, which is based on the
[nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
-and [Zephyr RTOS](https://zephyrproject.org/). Visit CHIP's
+and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
to read more about the platform structure and dependencies.
Pigweed libraries are built and organized in a way that enables faster and more
-reliable development. In the CHIP project, the Pigweed module is planned to be
+reliable development. In the Matter project, the Pigweed module is planned to be
used to create system infrastructures, for example for performing on-device
tests, but considering its general functionalities, it can be useful also in
other cases.
@@ -111,7 +112,7 @@
## Setting up the environment
-Before building the example, check out the CHIP repository and sync submodules
+Before building the example, check out the Matter repository and sync submodules
using the following command:
$ git submodule update --init
@@ -149,7 +150,7 @@
- _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
SDK source directory.
- - _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
+ - _~/connectedhomeip_ must be replaced with an absolute path to the Matter
source directory.
- _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
parameters can be omitted if you are not planning to flash the example
@@ -186,20 +187,20 @@
If you have the SDK already installed, continue to the next step and update
the nRF Connect SDK after initializing environment variables.
-3. Initialize environment variables referred to by the CHIP and the nRF Connect
- SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
- Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
- Arm Embedded Toolchain.
+3. Initialize environment variables referred to by the Matter and the nRF
+ Connect SDK build scripts. Replace _nrfconnect-dir_ with the path to your
+ nRF Connect SDK installation directory, and _toolchain-dir_ with the path to
+ GNU Arm Embedded Toolchain.
$ source nrfconnect-dir/zephyr/zephyr-env.sh
$ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
$ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
4. Update the nRF Connect SDK to the most recent supported revision by running
- the following command (replace _chip-dir_ with the path to CHIP repository
- directory):
+ the following command (replace _matter-dir_ with the path to Matter
+ repository directory):
- $ cd chip-dir
+ $ cd matter-dir
$ python3 scripts/setup/nrfconnect/update_ncs.py --update
Now you can proceed with the [Building](#building) instruction.
diff --git a/examples/pump-app/nrfconnect/README.md b/examples/pump-app/nrfconnect/README.md
index 3db2339..857c790 100644
--- a/examples/pump-app/nrfconnect/README.md
+++ b/examples/pump-app/nrfconnect/README.md
@@ -45,11 +45,11 @@
This example is running on the nRF Connect platform, which is based on Nordic
Semiconductor's
[nRF Connect SDK](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/index.html)
-and [Zephyr RTOS](https://zephyrproject.org/). Visit CHIP's
+and [Zephyr RTOS](https://zephyrproject.org/). Visit Matter's
[nRF Connect platform overview](../../../docs/guides/nrfconnect_platform_overview.md)
to read more about the platform structure and dependencies.
-The CHIP device that runs the pump application is controlled by the Matter
+The Matter device that runs the pump application is controlled by the Matter
controller device over the Thread protocol. By default, the Matter device has
Thread disabled, and it should be paired with Matter controller and get
configuration from it. Some actions required before establishing full
@@ -170,13 +170,14 @@
**NFC port with antenna attached** can be used to start the
[rendezvous](#bluetooth-le-rendezvous) by providing the commissioning
-information from the CHIP device in a data payload that can be shared using NFC.
+information from the Matter device in a data payload that can be shared using
+NFC.
<hr>
## Setting up the environment
-Before building the example, check out the CHIP repository and sync submodules
+Before building the example, check out the Matter repository and sync submodules
using the following command:
$ git submodule update --init
@@ -214,7 +215,7 @@
- _~/nrfconnect_ can be replaced with an absolute path to the nRF Connect
SDK source directory.
- - _~/connectedhomeip_ must be replaced with an absolute path to the CHIP
+ - _~/connectedhomeip_ must be replaced with an absolute path to the Matter
source directory.
- _-v /dev/bus/usb:/dev/bus/usb --device-cgroup-rule "c 189:_ rmw"\*
parameters can be omitted if you are not planning to flash the example
@@ -251,20 +252,20 @@
If you have the SDK already installed, continue to the next step and update
the nRF Connect SDK after initializing environment variables.
-3. Initialize environment variables referred to by the CHIP and the nRF Connect
- SDK build scripts. Replace _nrfconnect-dir_ with the path to your nRF
- Connect SDK installation directory, and _toolchain-dir_ with the path to GNU
- Arm Embedded Toolchain.
+3. Initialize environment variables referred to by the Matter and the nRF
+ Connect SDK build scripts. Replace _nrfconnect-dir_ with the path to your
+ nRF Connect SDK installation directory, and _toolchain-dir_ with the path to
+ GNU Arm Embedded Toolchain.
$ source nrfconnect-dir/zephyr/zephyr-env.sh
$ export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
$ export GNUARMEMB_TOOLCHAIN_PATH=toolchain-dir
4. Update the nRF Connect SDK to the most recent supported revision by running
- the following command (replace _chip-dir_ with the path to CHIP repository
- directory):
+ the following command (replace _matter-dir_ with the path to Matter
+ repository directory):
- $ cd chip-dir
+ $ cd matter-dir
$ python3 scripts/setup/nrfconnect/update_ncs.py --update
Now you can proceed with the [Building](#building) instruction.
@@ -366,4 +367,4 @@
[Android commissioning guide](../../../docs/guides/nrfconnect_android_commissioning.md)
to see how to use [CHIPTool](../../../src/android/CHIPTool/README.md) for
Android smartphones to commission and control the application within a
-CHIP-enabled Thread network.
+Matter-enabled Thread network.
diff --git a/examples/shell/README.md b/examples/shell/README.md
index 47d79d0..f94f602 100644
--- a/examples/shell/README.md
+++ b/examples/shell/README.md
@@ -1,9 +1,9 @@
-# CHIP Shell Reference
+# Matter Shell Reference
The `chip-shell` firmware exposes configuration and management APIs via a
-command line interface (CLI). Use the shell CLI to experiment with CHIP
-interactively, which can also be used with additional application code. The CHIP
-functional test scripts use the shell CLI to execute test cases.
+command line interface (CLI). Use the shell CLI to experiment with Matter
+interactively, which can also be used with additional application code. The
+Matter functional test scripts use the shell CLI to execute test cases.
## Separator and escaping characters
@@ -26,7 +26,7 @@
>
```
-## CHIP Shell Command List
+## Matter Shell Command List
- [base64](#base64-decode-b64_string)
- [device](README_DEVICE.md)
@@ -38,7 +38,7 @@
- [rand](#rand)
- [version](#version)
-## CHIP Shell Command Details
+## Matter Shell Command Details
### help
@@ -111,7 +111,7 @@
### version
-Output the version of the CHIP stack.
+Output the version of the Matter stack.
```bash
> version
diff --git a/examples/shell/README_DEVICE.md b/examples/shell/README_DEVICE.md
index aa4371b..2ca8ae1 100644
--- a/examples/shell/README_DEVICE.md
+++ b/examples/shell/README_DEVICE.md
@@ -1,6 +1,6 @@
-# CHIP Shell - Device Layer module
+# Matter Shell - Device Layer module
-The chip::DeviceLayer APIs may be invoked via the CHIP Shell CLI.
+The chip::DeviceLayer APIs may be invoked via the Matter Shell CLI.
## Command List
@@ -75,7 +75,7 @@
### start
-Initialize the chip stack and start the device layer event loop.
+Initialize the Matter stack and start the device layer event loop.
```bash
> device start
diff --git a/examples/shell/README_OTCLI.md b/examples/shell/README_OTCLI.md
index 2f2772b..dcbd07a 100644
--- a/examples/shell/README_OTCLI.md
+++ b/examples/shell/README_OTCLI.md
@@ -1,7 +1,7 @@
-# CHIP Shell - OpenThread CLI pass-through
+# Matter Shell - OpenThread CLI pass-through
-The CHIP Shell CLI can execute pass-through commands to the
-[OpenThread cli](https://github.com/openthread/openthread/blob/master/src/cli/README.md)
+The Matter Shell CLI can execute pass-through commands to the
+[OpenThread CLI](https://github.com/openthread/openthread/blob/master/src/cli/README.md)
directly.
## Setup
diff --git a/examples/shell/nrfconnect/README.md b/examples/shell/nrfconnect/README.md
index 8e17340..f0abf5e 100644
--- a/examples/shell/nrfconnect/README.md
+++ b/examples/shell/nrfconnect/README.md
@@ -1,6 +1,6 @@
-# CHIP nRF Connect SDK Shell Application
+# Matter nRF Connect SDK Shell Application
-A [chip-shell](../README.md) project for the Nordic nRF52840 and nRF5340
+A [Matter shell](../README.md) project for the Nordic nRF52840 and nRF5340
development kits, built using the nRF Connect SDK.
## Building
