diff --git a/LICENSE-APACHE2 b/LICENSE-APACHE2
index 55efbd0..4e1a8f3 100644
--- a/LICENSE-APACHE2
+++ b/LICENSE-APACHE2
@@ -187,7 +187,8 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020-2021 VMware Inc or its affiliates.
+   Copyright 2020-2023 Broadcom. All Rights Reserved.
+   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ
index e4c04d0..eb0228f 100644
--- a/LICENSE-MPL-RabbitMQ
+++ b/LICENSE-MPL-RabbitMQ
@@ -367,4 +367,5 @@ for such a notice.
 The Original Code is RabbitMQ.
 
 The Initial Developer of the Original Code is Pivotal Software, Inc.
-Copyright (c) 2020-2021 VMware, Inc or its affiliates.  All rights reserved.
\ No newline at end of file
+Copyright (c) 2020-2023 Broadcom. All Rights Reserved.
+The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
\ No newline at end of file
diff --git a/README.adoc b/README.adoc
index 197a165..a2e90e4 100644
--- a/README.adoc
+++ b/README.adoc
@@ -3,7 +3,7 @@
 image:https://github.com/rabbitmq/rabbitmq-stream-perf-test/actions/workflows/test.yml/badge.svg["Build Status", link="https://github.com/rabbitmq/rabbitmq-stream-perf-test/actions/workflows/test.yml"]
 
 This repository contains source code of the RabbitMQ Stream Performance Testing Tool.
-The client is maintained by the https://github.com/rabbitmq/[RabbitMQ team at VMware].
+The client is maintained by the https://github.com/rabbitmq/[RabbitMQ team at VMware by Broadcom].
 
 Stream PerfTest is based on the https://github.com/rabbitmq/rabbitmq-stream-java-client/[stream Java client] and uses the https://github.com/rabbitmq/rabbitmq-server/blob/main/deps/rabbitmq_stream/docs/PROTOCOL.adoc[stream protocol] to communicate with a RabbitMQ cluster.
 Use https://perftest.rabbitmq.com[PerfTest] if you want to test streams or queues with https://www.rabbitmq.com/tutorials/amqp-concepts.html[AMQP 0.9.1].
@@ -103,6 +103,7 @@ Please launch the `./mvnw spotless:apply` command to format your changes before
 
 == Copyright and License
 
-(c) 2020-2023, VMware Inc or its affiliates.
+(c) 2020-2023 Broadcom. All Rights Reserved.
+The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
 Double licensed under the MPL2.0 and ASL2. See link:LICENSE[LICENSE] for details.
diff --git a/pom.xml b/pom.xml
index 1026035..5d60dd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,13 @@
     <developer>
       <email>info@rabbitmq.com</email>
       <name>Team RabbitMQ</name>
-      <organization>VMware, Inc. or its affiliates.</organization>
+      <organization>VMware by Broadcom</organization>
       <organizationUrl>https://rabbitmq.com</organizationUrl>
     </developer>
   </developers>
 
   <organization>
-    <name>VMware, Inc. or its affiliates.</name>
+    <name>VMware by Broadcom</name>
     <url>https://www.rabbitmq.com</url>
   </organization>
 
@@ -368,7 +368,7 @@
           </java>
 <!--          <ratchetFrom>origin/main</ratchetFrom>-->
           <licenseHeader> <!-- specify either content or file, but not both -->
-            <content>// Copyright (c) $YEAR VMware, Inc. or its affiliates.  All rights reserved.
+            <content>// Copyright (c) $YEAR Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
               //
               // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
               // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java b/src/main/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java
index f5728fe..151feaa 100644
--- a/src/main/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java
+++ b/src/main/java/com/rabbitmq/stream/perf/DebugEndpointMonitoring.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronization.java b/src/main/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronization.java
index d333732..bb4fb35 100644
--- a/src/main/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronization.java
+++ b/src/main/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronization.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java b/src/main/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java
index b34e93f..4de43be 100644
--- a/src/main/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java
+++ b/src/main/java/com/rabbitmq/stream/perf/DefaultPerformanceMetrics.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/InstanceSynchronization.java b/src/main/java/com/rabbitmq/stream/perf/InstanceSynchronization.java
index eab47e4..427df13 100644
--- a/src/main/java/com/rabbitmq/stream/perf/InstanceSynchronization.java
+++ b/src/main/java/com/rabbitmq/stream/perf/InstanceSynchronization.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/LogUtils.java b/src/main/java/com/rabbitmq/stream/perf/LogUtils.java
index 4454c4d..865dd7e 100644
--- a/src/main/java/com/rabbitmq/stream/perf/LogUtils.java
+++ b/src/main/java/com/rabbitmq/stream/perf/LogUtils.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/Monitoring.java b/src/main/java/com/rabbitmq/stream/perf/Monitoring.java
index 6fc8a43..305a462 100644
--- a/src/main/java/com/rabbitmq/stream/perf/Monitoring.java
+++ b/src/main/java/com/rabbitmq/stream/perf/Monitoring.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/MonitoringContext.java b/src/main/java/com/rabbitmq/stream/perf/MonitoringContext.java
index 3ec7543..b2b30ad 100644
--- a/src/main/java/com/rabbitmq/stream/perf/MonitoringContext.java
+++ b/src/main/java/com/rabbitmq/stream/perf/MonitoringContext.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/PerformanceMetrics.java b/src/main/java/com/rabbitmq/stream/perf/PerformanceMetrics.java
index dfb034a..226a8ef 100644
--- a/src/main/java/com/rabbitmq/stream/perf/PerformanceMetrics.java
+++ b/src/main/java/com/rabbitmq/stream/perf/PerformanceMetrics.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/PrometheusEndpointMonitoring.java b/src/main/java/com/rabbitmq/stream/perf/PrometheusEndpointMonitoring.java
index 3b4adbb..8760d88 100644
--- a/src/main/java/com/rabbitmq/stream/perf/PrometheusEndpointMonitoring.java
+++ b/src/main/java/com/rabbitmq/stream/perf/PrometheusEndpointMonitoring.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/ShutdownService.java b/src/main/java/com/rabbitmq/stream/perf/ShutdownService.java
index 3868407..56aabf0 100644
--- a/src/main/java/com/rabbitmq/stream/perf/ShutdownService.java
+++ b/src/main/java/com/rabbitmq/stream/perf/ShutdownService.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/StreamPerfTest.java b/src/main/java/com/rabbitmq/stream/perf/StreamPerfTest.java
index 92e59b0..5e36760 100644
--- a/src/main/java/com/rabbitmq/stream/perf/StreamPerfTest.java
+++ b/src/main/java/com/rabbitmq/stream/perf/StreamPerfTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/Utils.java b/src/main/java/com/rabbitmq/stream/perf/Utils.java
index 20e4113..5576cb4 100644
--- a/src/main/java/com/rabbitmq/stream/perf/Utils.java
+++ b/src/main/java/com/rabbitmq/stream/perf/Utils.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/main/java/com/rabbitmq/stream/perf/Version.java b/src/main/java/com/rabbitmq/stream/perf/Version.java
index 0482a76..d64d2b0 100644
--- a/src/main/java/com/rabbitmq/stream/perf/Version.java
+++ b/src/main/java/com/rabbitmq/stream/perf/Version.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/AggregatingCommandForAutoComplete.java b/src/test/java/com/rabbitmq/stream/perf/AggregatingCommandForAutoComplete.java
index 21b600a..ee7990f 100644
--- a/src/test/java/com/rabbitmq/stream/perf/AggregatingCommandForAutoComplete.java
+++ b/src/test/java/com/rabbitmq/stream/perf/AggregatingCommandForAutoComplete.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronizationTest.java b/src/test/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronizationTest.java
index 72b5ff0..5f52d14 100644
--- a/src/test/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronizationTest.java
+++ b/src/test/java/com/rabbitmq/stream/perf/DefaultInstanceSynchronizationTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/Host.java b/src/test/java/com/rabbitmq/stream/perf/Host.java
index 9ed5f23..773b202 100644
--- a/src/test/java/com/rabbitmq/stream/perf/Host.java
+++ b/src/test/java/com/rabbitmq/stream/perf/Host.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/LogUtilsTest.java b/src/test/java/com/rabbitmq/stream/perf/LogUtilsTest.java
index c352942..4fc2ced 100644
--- a/src/test/java/com/rabbitmq/stream/perf/LogUtilsTest.java
+++ b/src/test/java/com/rabbitmq/stream/perf/LogUtilsTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/StreamPerfTestTest.java b/src/test/java/com/rabbitmq/stream/perf/StreamPerfTestTest.java
index 98569c5..9a2d40d 100644
--- a/src/test/java/com/rabbitmq/stream/perf/StreamPerfTestTest.java
+++ b/src/test/java/com/rabbitmq/stream/perf/StreamPerfTestTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2021-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/TestUtils.java b/src/test/java/com/rabbitmq/stream/perf/TestUtils.java
index 894f132..71b1e64 100644
--- a/src/test/java/com/rabbitmq/stream/perf/TestUtils.java
+++ b/src/test/java/com/rabbitmq/stream/perf/TestUtils.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").
diff --git a/src/test/java/com/rabbitmq/stream/perf/UtilsTest.java b/src/test/java/com/rabbitmq/stream/perf/UtilsTest.java
index 1d3a745..c7e3b8f 100644
--- a/src/test/java/com/rabbitmq/stream/perf/UtilsTest.java
+++ b/src/test/java/com/rabbitmq/stream/perf/UtilsTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2020-2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Stream Performance Testing Tool, is dual-licensed under the
 // Mozilla Public License 2.0 ("MPL"), and the Apache License version 2 ("ASL").