diff --git a/examples/common/pigweed/rpc_services/Attributes.h b/examples/common/pigweed/rpc_services/Attributes.h
index 68a85e48d620da..34d44b7f5c64a8 100644
--- a/examples/common/pigweed/rpc_services/Attributes.h
+++ b/examples/common/pigweed/rpc_services/Attributes.h
@@ -29,7 +29,7 @@ namespace chip {
 namespace rpc {
 
 // Implementation class for chip.rpc.Attributes.
-class Attributes : public generated::Attributes<Attributes>
+class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
 {
 public:
     ::pw::Status Write(const chip_rpc_AttributeWrite & request, pw_protobuf_Empty & response)
diff --git a/examples/common/pigweed/rpc_services/Button.h b/examples/common/pigweed/rpc_services/Button.h
index 924783a5d6f86c..074a0c6cf95fe1 100644
--- a/examples/common/pigweed/rpc_services/Button.h
+++ b/examples/common/pigweed/rpc_services/Button.h
@@ -23,7 +23,7 @@
 namespace chip {
 namespace rpc {
 
-class Button : public generated::Button<Button>
+class Button : public pw_rpc::nanopb::Button::Service<Button>
 {
 public:
     virtual ~Button() = default;
diff --git a/examples/common/pigweed/rpc_services/Device.h b/examples/common/pigweed/rpc_services/Device.h
index 43b477eed7e232..de41f5927165ca 100644
--- a/examples/common/pigweed/rpc_services/Device.h
+++ b/examples/common/pigweed/rpc_services/Device.h
@@ -30,7 +30,7 @@
 namespace chip {
 namespace rpc {
 
-class Device : public generated::Device<Device>
+class Device : public pw_rpc::nanopb::Device::Service<Device>
 {
 public:
     virtual ~Device() = default;
diff --git a/examples/common/pigweed/rpc_services/Lighting.h b/examples/common/pigweed/rpc_services/Lighting.h
index 3430c31b7ec741..fb5055f0159ed2 100644
--- a/examples/common/pigweed/rpc_services/Lighting.h
+++ b/examples/common/pigweed/rpc_services/Lighting.h
@@ -28,7 +28,7 @@
 namespace chip {
 namespace rpc {
 
-class Lighting : public generated::Lighting<Lighting>
+class Lighting : public pw_rpc::nanopb::Lighting::Service<Lighting>
 {
 public:
     Lighting(bool support_level = true, bool support_color = true) : mSupportLevel(support_level), mSupportColor(support_color) {}
diff --git a/examples/common/pigweed/rpc_services/Locking.h b/examples/common/pigweed/rpc_services/Locking.h
index 18f0cb51bb53a0..3d6df4df2e9680 100644
--- a/examples/common/pigweed/rpc_services/Locking.h
+++ b/examples/common/pigweed/rpc_services/Locking.h
@@ -27,7 +27,7 @@
 namespace chip {
 namespace rpc {
 
-class Locking final : public generated::Locking<Locking>
+class Locking final : public pw_rpc::nanopb::Locking::Service<Locking>
 {
 public:
     virtual ~Locking() = default;
diff --git a/examples/ipv6only-app/esp32/include/wifi_service.h b/examples/ipv6only-app/esp32/include/wifi_service.h
index ddb12cb781f89c..b2db2e1223b3b2 100644
--- a/examples/ipv6only-app/esp32/include/wifi_service.h
+++ b/examples/ipv6only-app/esp32/include/wifi_service.h
@@ -31,7 +31,7 @@
 namespace chip {
 namespace rpc {
 
-class Wifi final : public generated::Wifi<Wifi>
+class Wifi final : public pw_rpc::nanopb::Wifi::Service<Wifi>
 {
 public:
     // Singleton
diff --git a/scripts/constraints.txt b/scripts/constraints.txt
index 7536963ec9345a..76a29a9a33ac95 100644
--- a/scripts/constraints.txt
+++ b/scripts/constraints.txt
@@ -172,7 +172,7 @@ prettytable==2.2.1
     # via
     #   mbed-ls
     #   mbed-os-tools
-prompt-toolkit==3.0.20
+prompt-toolkit==3.0.21
     # via ipython
 protobuf==3.17.3
     # via -r requirements.txt
diff --git a/src/test_driver/efr32/src/main.cpp b/src/test_driver/efr32/src/main.cpp
index 92f1f53bb29205..a99e39e10879fa 100644
--- a/src/test_driver/efr32/src/main.cpp
+++ b/src/test_driver/efr32/src/main.cpp
@@ -44,7 +44,7 @@ extern "C" int printf(const char * format, ...)
 
 namespace chip::rpc {
 
-class NlTest : public generated::NlTest<NlTest>
+class NlTest : public pw_rpc::nanopb::NlTest::Service<NlTest>
 {
 public:
     void Run(const pw_protobuf_Empty & request, ServerWriter<chip_rpc_Event> & writer)
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 53f260084d032f..444f6d0df8a002 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 53f260084d032fbf937e09a06c5fca108bede4a1
+Subproject commit 444f6d0df8a002a7c577066dcb1eca939c0a6b13