diff --git a/data/api/application-service/query_room.yaml b/data/api/application-service/query_room.yaml
index 57175637..9198403e 100644
--- a/data/api/application-service/query_room.yaml
+++ b/data/api/application-service/query_room.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/application-service/query_user.yaml b/data/api/application-service/query_user.yaml
index c8ca9781..4db2fd5d 100644
--- a/data/api/application-service/query_user.yaml
+++ b/data/api/application-service/query_user.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/application-service/transactions.yaml b/data/api/application-service/transactions.yaml
index 29512973..c362d048 100644
--- a/data/api/application-service/transactions.yaml
+++ b/data/api/application-service/transactions.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/account-data.yaml b/data/api/client-server/account-data.yaml
index fea15d95..1d2a7612 100644
--- a/data/api/client-server/account-data.yaml
+++ b/data/api/client-server/account-data.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/admin.yaml b/data/api/client-server/admin.yaml
index 19f084b7..d5afbeed 100644
--- a/data/api/client-server/admin.yaml
+++ b/data/api/client-server/admin.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/administrative_contact.yaml b/data/api/client-server/administrative_contact.yaml
index eddb2b01..67d45340 100644
--- a/data/api/client-server/administrative_contact.yaml
+++ b/data/api/client-server/administrative_contact.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/authed-content-repo.yaml b/data/api/client-server/authed-content-repo.yaml
index 53416cf3..2fbafb29 100644
--- a/data/api/client-server/authed-content-repo.yaml
+++ b/data/api/client-server/authed-content-repo.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2019-2024 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/banning.yaml b/data/api/client-server/banning.yaml
index 3cb9a540..347fe1a7 100644
--- a/data/api/client-server/banning.yaml
+++ b/data/api/client-server/banning.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml
index c64a914b..54e0b608 100644
--- a/data/api/client-server/content-repo.yaml
+++ b/data/api/client-server/content-repo.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml
index 9e36d5e8..2d4b2de5 100644
--- a/data/api/client-server/create_room.yaml
+++ b/data/api/client-server/create_room.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/definitions/auth_data.yaml b/data/api/client-server/definitions/auth_data.yaml
index 0186b24e..540df1a4 100644
--- a/data/api/client-server/definitions/auth_data.yaml
+++ b/data/api/client-server/definitions/auth_data.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/auth_response.yaml b/data/api/client-server/definitions/auth_response.yaml
index f4824e52..9576e923 100644
--- a/data/api/client-server/definitions/auth_response.yaml
+++ b/data/api/client-server/definitions/auth_response.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/client_device.yaml b/data/api/client-server/definitions/client_device.yaml
index 6dc3abf3..e7b05036 100644
--- a/data/api/client-server/definitions/client_device.yaml
+++ b/data/api/client-server/definitions/client_device.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/device_keys.yaml b/data/api/client-server/definitions/device_keys.yaml
index 2a7f8104..1a417881 100644
--- a/data/api/client-server/definitions/device_keys.yaml
+++ b/data/api/client-server/definitions/device_keys.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/errors/error.yaml b/data/api/client-server/definitions/errors/error.yaml
index 89a0d44f..78e1bef9 100644
--- a/data/api/client-server/definitions/errors/error.yaml
+++ b/data/api/client-server/definitions/errors/error.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/event_batch.yaml b/data/api/client-server/definitions/event_batch.yaml
index cc2453ed..919a1574 100644
--- a/data/api/client-server/definitions/event_batch.yaml
+++ b/data/api/client-server/definitions/event_batch.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/definitions/event_filter.yaml b/data/api/client-server/definitions/event_filter.yaml
index d03c85da..e159f76b 100644
--- a/data/api/client-server/definitions/event_filter.yaml
+++ b/data/api/client-server/definitions/event_filter.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/push_condition.yaml b/data/api/client-server/definitions/push_condition.yaml
index 1e7a8583..d88da1a2 100644
--- a/data/api/client-server/definitions/push_condition.yaml
+++ b/data/api/client-server/definitions/push_condition.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/push_rule.yaml b/data/api/client-server/definitions/push_rule.yaml
index a6534895..7773ca30 100644
--- a/data/api/client-server/definitions/push_rule.yaml
+++ b/data/api/client-server/definitions/push_rule.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/push_ruleset.yaml b/data/api/client-server/definitions/push_ruleset.yaml
index 0a2148e0..55d03d24 100644
--- a/data/api/client-server/definitions/push_ruleset.yaml
+++ b/data/api/client-server/definitions/push_ruleset.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/room_event_filter.yaml b/data/api/client-server/definitions/room_event_filter.yaml
index ab8ef79e..d19e9b7a 100644
--- a/data/api/client-server/definitions/room_event_filter.yaml
+++ b/data/api/client-server/definitions/room_event_filter.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2022 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/definitions/security.yaml b/data/api/client-server/definitions/security.yaml
index 0c9bd1c7..c613f79f 100644
--- a/data/api/client-server/definitions/security.yaml
+++ b/data/api/client-server/definitions/security.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/sync_filter.yaml b/data/api/client-server/definitions/sync_filter.yaml
index 75544e94..e165b66b 100644
--- a/data/api/client-server/definitions/sync_filter.yaml
+++ b/data/api/client-server/definitions/sync_filter.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/definitions/timeline_batch.yaml b/data/api/client-server/definitions/timeline_batch.yaml
index 5b95f583..00f75ac9 100644
--- a/data/api/client-server/definitions/timeline_batch.yaml
+++ b/data/api/client-server/definitions/timeline_batch.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/device_management.yaml b/data/api/client-server/device_management.yaml
index b2bcb8ce..af3eb778 100644
--- a/data/api/client-server/device_management.yaml
+++ b/data/api/client-server/device_management.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/directory.yaml b/data/api/client-server/directory.yaml
index f5c357d9..9e600145 100644
--- a/data/api/client-server/directory.yaml
+++ b/data/api/client-server/directory.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/event_context.yaml b/data/api/client-server/event_context.yaml
index 0c927a6d..294b400f 100644
--- a/data/api/client-server/event_context.yaml
+++ b/data/api/client-server/event_context.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/filter.yaml b/data/api/client-server/filter.yaml
index f1135939..50ef213f 100644
--- a/data/api/client-server/filter.yaml
+++ b/data/api/client-server/filter.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/inviting.yaml b/data/api/client-server/inviting.yaml
index 6aa9e08a..ad7eefab 100644
--- a/data/api/client-server/inviting.yaml
+++ b/data/api/client-server/inviting.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/joining.yaml b/data/api/client-server/joining.yaml
index 1019abbd..9a61e1e2 100644
--- a/data/api/client-server/joining.yaml
+++ b/data/api/client-server/joining.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml
index de4501b3..839db23a 100644
--- a/data/api/client-server/keys.yaml
+++ b/data/api/client-server/keys.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 # Copyright 2020 The Matrix.org Foundation C.I.C.
 #
diff --git a/data/api/client-server/kicking.yaml b/data/api/client-server/kicking.yaml
index eb5b02d2..cbf09dda 100644
--- a/data/api/client-server/kicking.yaml
+++ b/data/api/client-server/kicking.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/leaving.yaml b/data/api/client-server/leaving.yaml
index 6bdadb08..15038d45 100644
--- a/data/api/client-server/leaving.yaml
+++ b/data/api/client-server/leaving.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/list_public_rooms.yaml b/data/api/client-server/list_public_rooms.yaml
index 497ccb44..b6fa77e5 100644
--- a/data/api/client-server/list_public_rooms.yaml
+++ b/data/api/client-server/list_public_rooms.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/login.yaml b/data/api/client-server/login.yaml
index 28de0be1..b2fce868 100644
--- a/data/api/client-server/login.yaml
+++ b/data/api/client-server/login.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 # Copyright 2022 The Matrix.org Foundation C.I.C.
 #
diff --git a/data/api/client-server/logout.yaml b/data/api/client-server/logout.yaml
index 60464932..0d5efd48 100644
--- a/data/api/client-server/logout.yaml
+++ b/data/api/client-server/logout.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/message_pagination.yaml b/data/api/client-server/message_pagination.yaml
index 4d5c94e1..dae0a5bc 100644
--- a/data/api/client-server/message_pagination.yaml
+++ b/data/api/client-server/message_pagination.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/notifications.yaml b/data/api/client-server/notifications.yaml
index 03db22af..572ec8e9 100644
--- a/data/api/client-server/notifications.yaml
+++ b/data/api/client-server/notifications.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/old_sync.yaml b/data/api/client-server/old_sync.yaml
index 0a3c0439..c5281038 100644
--- a/data/api/client-server/old_sync.yaml
+++ b/data/api/client-server/old_sync.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/peeking_events.yaml b/data/api/client-server/peeking_events.yaml
index eaea5bbb..35c69118 100644
--- a/data/api/client-server/peeking_events.yaml
+++ b/data/api/client-server/peeking_events.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/presence.yaml b/data/api/client-server/presence.yaml
index d3141911..5265ed91 100644
--- a/data/api/client-server/presence.yaml
+++ b/data/api/client-server/presence.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/profile.yaml b/data/api/client-server/profile.yaml
index 6e588ae3..ade41e3e 100644
--- a/data/api/client-server/profile.yaml
+++ b/data/api/client-server/profile.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/pusher.yaml b/data/api/client-server/pusher.yaml
index d2a59204..aedd2c93 100644
--- a/data/api/client-server/pusher.yaml
+++ b/data/api/client-server/pusher.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/pushrules.yaml b/data/api/client-server/pushrules.yaml
index fd56f46e..55dfaa30 100644
--- a/data/api/client-server/pushrules.yaml
+++ b/data/api/client-server/pushrules.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/receipts.yaml b/data/api/client-server/receipts.yaml
index c68ef3f6..81b9464f 100644
--- a/data/api/client-server/receipts.yaml
+++ b/data/api/client-server/receipts.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2022 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/redaction.yaml b/data/api/client-server/redaction.yaml
index a61f01c4..3ebeb990 100644
--- a/data/api/client-server/redaction.yaml
+++ b/data/api/client-server/redaction.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/registration.yaml b/data/api/client-server/registration.yaml
index 1dd314b8..78709190 100644
--- a/data/api/client-server/registration.yaml
+++ b/data/api/client-server/registration.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2022 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/room_send.yaml b/data/api/client-server/room_send.yaml
index 25d8a75b..9c356bb4 100644
--- a/data/api/client-server/room_send.yaml
+++ b/data/api/client-server/room_send.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2023 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/room_state.yaml b/data/api/client-server/room_state.yaml
index 7096f511..159218a4 100644
--- a/data/api/client-server/room_state.yaml
+++ b/data/api/client-server/room_state.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/rooms.yaml b/data/api/client-server/rooms.yaml
index a2197f34..76741414 100644
--- a/data/api/client-server/rooms.yaml
+++ b/data/api/client-server/rooms.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/search.yaml b/data/api/client-server/search.yaml
index 587894ff..202cb24a 100644
--- a/data/api/client-server/search.yaml
+++ b/data/api/client-server/search.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/tags.yaml b/data/api/client-server/tags.yaml
index c8e1d78c..c53f190c 100644
--- a/data/api/client-server/tags.yaml
+++ b/data/api/client-server/tags.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/client-server/third_party_membership.yaml b/data/api/client-server/third_party_membership.yaml
index ea366648..4d0a2ef3 100644
--- a/data/api/client-server/third_party_membership.yaml
+++ b/data/api/client-server/third_party_membership.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/to_device.yaml b/data/api/client-server/to_device.yaml
index cea23ab7..dba0c204 100644
--- a/data/api/client-server/to_device.yaml
+++ b/data/api/client-server/to_device.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/typing.yaml b/data/api/client-server/typing.yaml
index 0d21f452..d6b1411e 100644
--- a/data/api/client-server/typing.yaml
+++ b/data/api/client-server/typing.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/versions.yaml b/data/api/client-server/versions.yaml
index bf4353f2..8d427fee 100644
--- a/data/api/client-server/versions.yaml
+++ b/data/api/client-server/versions.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/client-server/voip.yaml b/data/api/client-server/voip.yaml
index 4466e36c..d2636354 100644
--- a/data/api/client-server/voip.yaml
+++ b/data/api/client-server/voip.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/data/api/identity/v2_lookup.yaml b/data/api/identity/v2_lookup.yaml
index e3c7985f..517b4649 100644
--- a/data/api/identity/v2_lookup.yaml
+++ b/data/api/identity/v2_lookup.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2017 Kamax.io
 # Copyright 2017 New Vector Ltd
 # Copyright 2018 New Vector Ltd
diff --git a/data/api/identity/v2_pubkey.yaml b/data/api/identity/v2_pubkey.yaml
index 2aaf5f8e..97a93882 100644
--- a/data/api/identity/v2_pubkey.yaml
+++ b/data/api/identity/v2_pubkey.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/data/api/push-gateway/push_notifier.yaml b/data/api/push-gateway/push_notifier.yaml
index 9f461a1c..0570caf1 100644
--- a/data/api/push-gateway/push_notifier.yaml
+++ b/data/api/push-gateway/push_notifier.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 # Copyright 2018 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/check-event-schema-examples.py b/scripts/check-event-schema-examples.py
index fae129f6..c4388799 100755
--- a/scripts/check-event-schema-examples.py
+++ b/scripts/check-event-schema-examples.py
@@ -4,7 +4,7 @@
 # schemas. In the process, the JSON schemas are validated against the JSON
 # Schema 2020-12 specification.
 
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/scripts/check-openapi-sources.py b/scripts/check-openapi-sources.py
index 4ba0392e..0ed8b6da 100755
--- a/scripts/check-openapi-sources.py
+++ b/scripts/check-openapi-sources.py
@@ -5,7 +5,7 @@
 # JSON Schema 2020-12 specification and the examples are validated against those
 # schemas.
 
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/scripts/dump-openapi.py b/scripts/dump-openapi.py
index 490ac9bf..405cb6b9 100755
--- a/scripts/dump-openapi.py
+++ b/scripts/dump-openapi.py
@@ -4,7 +4,7 @@
 # outputs a JSON file which merges them all, for use as input to an OpenAPI
 # viewer.
 
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/scripts/helpers.py b/scripts/helpers.py
index a30b2831..a24fd3d7 100755
--- a/scripts/helpers.py
+++ b/scripts/helpers.py
@@ -2,7 +2,7 @@
 
 # Helpers to resolve $ref recursively in OpenAPI and JSON schemas.
 
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # 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/scripts/openapi-http-server.py b/scripts/openapi-http-server.py
index 1865e6c8..7ab17ca6 100755
--- a/scripts/openapi-http-server.py
+++ b/scripts/openapi-http-server.py
@@ -3,7 +3,7 @@
 # Runs an HTTP server on localhost:8000 which will serve the generated OpenAPI
 # JSON so that it can be viewed in an online OpenAPI viewer.
 
-# Copyright 2016 OpenMarket Ltd
+# Copyright 2016 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.