32 files changed, 162 insertions, 132 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index a5dcbf8334..a8bf44313e 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -3742,6 +3742,7 @@
 /fr/docs/Web/API/SVGStylable	/fr/docs/orphaned/Web/API/SVGStylable
 /fr/docs/Web/API/Selection.toString	/fr/docs/Web/API/Selection/toString
 /fr/docs/Web/API/Selection_API	/fr/docs/conflicting/Web/API/Selection
+/fr/docs/Web/API/ServiceWorker/onstatechange	/fr/docs/Web/API/ServiceWorker/statechange_event
 /fr/docs/Web/API/ServiceWorkerState	/fr/docs/orphaned/Web/API/ServiceWorkerState
 /fr/docs/Web/API/SharedWorkerGlobalScope/onconnect	/fr/docs/Web/API/SharedWorkerGlobalScope/connect_event
 /fr/docs/Web/API/Storage/LocalStorage	/fr/docs/conflicting/Web/API/Window/localStorage
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index 4eb949802b..2f7310066a 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -19078,7 +19078,7 @@
       "nobe4"
     ]
   },
-  "Web/API/ServiceWorker/onstatechange": {
+  "Web/API/ServiceWorker/statechange_event": {
     "modified": "2019-03-23T22:37:05.749Z",
     "contributors": [
       "nobe4"
diff --git a/files/fr/web/api/serviceworker/onstatechange/index.md b/files/fr/web/api/serviceworker/statechange_event/index.md
index f499cdf8bb..0b84aeff07 100644
--- a/files/fr/web/api/serviceworker/onstatechange/index.md
+++ b/files/fr/web/api/serviceworker/statechange_event/index.md
@@ -1,11 +1,12 @@
 ---
 title: ServiceWorker.onstatechange
-slug: Web/API/ServiceWorker/onstatechange
+slug: Web/API/ServiceWorker/statechange_event
 tags:
   - API
   - Propriété
   - Reference
 translation_of: Web/API/ServiceWorker/onstatechange
+original_slug: Web/API/ServiceWorker/onstatechange
 ---
 {{SeeCompatTable}}{{APIRef("Service Workers API")}}
 
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 249a98cdc6..2af45584f1 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3217,6 +3217,7 @@
 /ja/docs/Web/API/NavigatorOnLine/onLine	/ja/docs/Web/API/Navigator/onLine
 /ja/docs/Web/API/NavigatorStorage	/ja/docs/orphaned/Web/API/NavigatorStorage
 /ja/docs/Web/API/NavigatorStorage/storage	/ja/docs/orphaned/Web/API/NavigatorStorage/storage
+/ja/docs/Web/API/NetworkInformation/onchange	/ja/docs/Web/API/NetworkInformation/change_event
 /ja/docs/Web/API/Node.appendChild	/ja/docs/Web/API/Node/appendChild
 /ja/docs/Web/API/Node.attributes	/ja/docs/Web/API/Element/attributes
 /ja/docs/Web/API/Node.baseURIObject	/ja/docs/Web/API/Node
@@ -4160,8 +4161,10 @@
 /ja/docs/Web/HTTP/HTTP_access_control/Errors/CORSPreflightDidNotSucceed	/ja/docs/Web/HTTP/CORS/Errors/CORSPreflightDidNotSucceed
 /ja/docs/Web/HTTP/HTTP_access_control/Errors/CORSRequestNotHttp	/ja/docs/Web/HTTP/CORS/Errors/CORSRequestNotHttp
 /ja/docs/Web/HTTP/HTTP_response_codes	/ja/docs/Web/HTTP/Status
+/ja/docs/Web/HTTP/Headers/Cookie2	/ja/docs/conflicting/Web/HTTP/Headers/Cookie
 /ja/docs/Web/HTTP/Headers/Feature-Policy/vr	/ja/docs/Web/HTTP/Headers/Feature-Policy/xr-spatial-tracking
 /ja/docs/Web/HTTP/Headers/Feature-Policy/xr	/ja/docs/conflicting/Web/HTTP/Headers/Feature-Policy/xr-spatial-tracking
+/ja/docs/Web/HTTP/Headers/Set-Cookie2	/ja/docs/Web/HTTP/Headers/Set-Cookie
 /ja/docs/Web/HTTP/Index	/ja/docs/conflicting/Web/HTTP
 /ja/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file	/ja/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_PAC_file
 /ja/docs/Web/HTTP/Response_codes	/ja/docs/Web/HTTP/Status
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 8898196d62..7c0aa15437 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -19022,14 +19022,14 @@
       "jprichardson"
     ]
   },
-  "Web/API/NetworkInformation/downlinkMax": {
-    "modified": "2019-03-23T22:28:25.185Z",
+  "Web/API/NetworkInformation/change_event": {
+    "modified": "2019-03-23T22:28:29.434Z",
     "contributors": [
       "YuichiNukiyama"
     ]
   },
-  "Web/API/NetworkInformation/onchange": {
-    "modified": "2019-03-23T22:28:29.434Z",
+  "Web/API/NetworkInformation/downlinkMax": {
+    "modified": "2019-03-23T22:28:25.185Z",
     "contributors": [
       "YuichiNukiyama"
     ]
@@ -35983,12 +35983,6 @@
       "technohippy"
     ]
   },
-  "Web/HTTP/Headers/Cookie2": {
-    "modified": "2020-10-15T22:08:54.618Z",
-    "contributors": [
-      "silverskyvicto"
-    ]
-  },
   "Web/HTTP/Headers/Cross-Origin-Resource-Policy": {
     "modified": "2020-10-15T22:28:41.646Z",
     "contributors": [
@@ -36284,12 +36278,8 @@
     ]
   },
   "Web/HTTP/Headers/Set-Cookie": {
-    "modified": "2020-10-15T22:09:30.260Z",
+    "modified": "2020-10-15T22:09:30.672Z",
     "contributors": [
-      "pcw",
-      "mfuji09",
-      "maizuka",
-      "niusounds",
       "silverskyvicto"
     ]
   },
@@ -36300,12 +36290,6 @@
       "silverskyvicto"
     ]
   },
-  "Web/HTTP/Headers/Set-Cookie2": {
-    "modified": "2020-10-15T22:09:30.672Z",
-    "contributors": [
-      "silverskyvicto"
-    ]
-  },
   "Web/HTTP/Headers/SourceMap": {
     "modified": "2020-10-15T22:09:30.889Z",
     "contributors": [
@@ -48552,6 +48536,12 @@
       "mfuji09"
     ]
   },
+  "conflicting/Web/HTTP/Headers/Cookie": {
+    "modified": "2020-10-15T22:08:54.618Z",
+    "contributors": [
+      "silverskyvicto"
+    ]
+  },
   "conflicting/Web/HTTP/Headers/Feature-Policy/xr-spatial-tracking": {
     "modified": "2020-08-12T12:42:41.854Z",
     "contributors": [
diff --git a/files/ja/web/http/headers/cookie2/index.html b/files/ja/conflicting/web/http/headers/cookie/index.html
index 7f95c9941b..8bb97a8215 100644
--- a/files/ja/web/http/headers/cookie2/index.html
+++ b/files/ja/conflicting/web/http/headers/cookie/index.html
@@ -1,6 +1,6 @@
 ---
 title: Cookie2
-slug: Web/HTTP/Headers/Cookie2
+slug: conflicting/Web/HTTP/Headers/Cookie
 tags:
   - HTTP
   - Obsolete
@@ -8,6 +8,7 @@ tags:
   - リクエスト
   - リファレンス
 translation_of: Web/HTTP/Headers/Cookie2
+original_slug: Web/HTTP/Headers/Cookie2
 ---
 <p>{{HTTPSidebar}} {{obsolete_header}}</p>
 
diff --git a/files/ja/web/api/networkinformation/onchange/index.html b/files/ja/web/api/networkinformation/change_event/index.html
index f6c540bebe..926f813316 100644
--- a/files/ja/web/api/networkinformation/onchange/index.html
+++ b/files/ja/web/api/networkinformation/change_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: NetworkInformation.onchange
-slug: Web/API/NetworkInformation/onchange
+slug: Web/API/NetworkInformation/change_event
 tags:
   - API
   - Event Handler
@@ -10,6 +10,7 @@ tags:
   - Property
   - Reference
 translation_of: Web/API/NetworkInformation/onchange
+original_slug: Web/API/NetworkInformation/onchange
 ---
 <p>{{apiref("Network Information API")}}{{SeeCompatTable}}</p>
 
diff --git a/files/ja/web/http/headers/set-cookie2/index.html b/files/ja/web/http/headers/set-cookie/index.html
index c1485dec4a..ca21a20bef 100644
--- a/files/ja/web/http/headers/set-cookie2/index.html
+++ b/files/ja/web/http/headers/set-cookie/index.html
@@ -1,6 +1,6 @@
 ---
 title: Set-Cookie2
-slug: Web/HTTP/Headers/Set-Cookie2
+slug: Web/HTTP/Headers/Set-Cookie
 tags:
   - Cookies
   - HTTP
@@ -8,6 +8,7 @@ tags:
   - ヘッダー
   - リファレンス
 translation_of: Web/HTTP/Headers/Set-Cookie2
+original_slug: Web/HTTP/Headers/Set-Cookie2
 ---
 <p>{{HTTPSidebar}} {{obsolete_header}}</p>
 
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index 80407fb56b..c4b68910cb 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -488,6 +488,11 @@
 /ko/docs/Web/API/Position	/ko/docs/Web/API/GeolocationPosition
 /ko/docs/Web/API/PositionOptions	/ko/docs/Web/API/Geolocation/getCurrentPosition
 /ko/docs/Web/API/RTCConfiguration	/ko/docs/Web/API/RTCPeerConnection/RTCPeerConnection
+/ko/docs/Web/API/RTCPeerConnection/onconnectionstatechange	/ko/docs/Web/API/RTCPeerConnection/connectionstatechange_event
+/ko/docs/Web/API/RTCPeerConnection/ondatachannel	/ko/docs/Web/API/RTCPeerConnection/datachannel_event
+/ko/docs/Web/API/RTCPeerConnection/onicecandidate	/ko/docs/Web/API/RTCPeerConnection/icecandidate_event
+/ko/docs/Web/API/RTCPeerConnection/onicegatheringstatechange	/ko/docs/conflicting/Web/API/RTCPeerConnection/icegatheringstatechange_event
+/ko/docs/Web/API/RTCPeerConnection/ontrack	/ko/docs/Web/API/RTCPeerConnection/track_event
 /ko/docs/Web/API/RandomSource	/ko/docs/Web/API/Crypto/getRandomValues
 /ko/docs/Web/API/RandomSource/getRandomValues	/ko/docs/Web/API/Crypto/getRandomValues
 /ko/docs/Web/API/Screen.lockOrientation	/ko/docs/Web/API/Screen/lockOrientation
@@ -497,6 +502,7 @@
 /ko/docs/Web/API/Screen.orientation	/ko/docs/Web/API/Screen/orientation
 /ko/docs/Web/API/Screen.orientation/window.screen.orientation	/ko/docs/Web/API/Screen/orientation
 /ko/docs/Web/API/Screen/onorientationchange	/ko/docs/Web/API/Screen/orientationchange_event
+/ko/docs/Web/API/ServiceWorker/onstatechange	/ko/docs/Web/API/ServiceWorker/statechange_event
 /ko/docs/Web/API/Streams_API/컨셉	/ko/docs/Web/API/Streams_API/Concepts
 /ko/docs/Web/API/WebGL_API/Adding_2D_content_to_a_WebGL_context	/ko/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
 /ko/docs/Web/API/WebGL_API/Animating_objects_with_WebGL	/ko/docs/Web/API/WebGL_API/Tutorial/Animating_objects_with_WebGL
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index b811cae08e..adbd504fa9 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -6127,6 +6127,12 @@
       "chansbro"
     ]
   },
+  "Web/API/RTCPeerConnection/connectionstatechange_event": {
+    "modified": "2020-10-15T22:21:46.935Z",
+    "contributors": [
+      "chansbro"
+    ]
+  },
   "Web/API/RTCPeerConnection/createAnswer": {
     "modified": "2020-10-15T22:21:52.646Z",
     "contributors": [
@@ -6151,6 +6157,12 @@
       "chansbro"
     ]
   },
+  "Web/API/RTCPeerConnection/datachannel_event": {
+    "modified": "2020-10-15T22:21:38.724Z",
+    "contributors": [
+      "chansbro"
+    ]
+  },
   "Web/API/RTCPeerConnection/generateCertificate": {
     "modified": "2020-10-15T22:22:01.110Z",
     "contributors": [
@@ -6193,44 +6205,20 @@
       "chansbro"
     ]
   },
-  "Web/API/RTCPeerConnection/icegatheringstatechange_event": {
-    "modified": "2020-10-15T22:21:34.594Z",
-    "contributors": [
-      "chansbro"
-    ]
-  },
-  "Web/API/RTCPeerConnection/localDescription": {
-    "modified": "2020-10-15T22:22:06.987Z",
-    "contributors": [
-      "chansbro"
-    ]
-  },
-  "Web/API/RTCPeerConnection/onconnectionstatechange": {
-    "modified": "2020-10-15T22:21:46.935Z",
-    "contributors": [
-      "chansbro"
-    ]
-  },
-  "Web/API/RTCPeerConnection/ondatachannel": {
-    "modified": "2020-10-15T22:21:38.724Z",
-    "contributors": [
-      "chansbro"
-    ]
-  },
-  "Web/API/RTCPeerConnection/onicecandidate": {
+  "Web/API/RTCPeerConnection/icecandidate_event": {
     "modified": "2020-10-15T22:21:32.954Z",
     "contributors": [
       "chansbro"
     ]
   },
-  "Web/API/RTCPeerConnection/onicegatheringstatechange": {
-    "modified": "2020-10-15T22:21:36.115Z",
+  "Web/API/RTCPeerConnection/icegatheringstatechange_event": {
+    "modified": "2020-10-15T22:21:34.594Z",
     "contributors": [
       "chansbro"
     ]
   },
-  "Web/API/RTCPeerConnection/ontrack": {
-    "modified": "2020-10-15T22:22:07.343Z",
+  "Web/API/RTCPeerConnection/localDescription": {
+    "modified": "2020-10-15T22:22:06.987Z",
     "contributors": [
       "chansbro"
     ]
@@ -6266,6 +6254,12 @@
       "chansbro"
     ]
   },
+  "Web/API/RTCPeerConnection/track_event": {
+    "modified": "2020-10-15T22:22:07.343Z",
+    "contributors": [
+      "chansbro"
+    ]
+  },
   "Web/API/RTCPeerConnectionIceEvent": {
     "modified": "2020-10-15T22:21:34.761Z",
     "contributors": [
@@ -6420,7 +6414,7 @@
       "minias"
     ]
   },
-  "Web/API/ServiceWorker/onstatechange": {
+  "Web/API/ServiceWorker/statechange_event": {
     "modified": "2020-10-15T22:20:48.975Z",
     "contributors": [
       "dragmove"
@@ -17502,6 +17496,12 @@
       "chansbro"
     ]
   },
+  "conflicting/Web/API/RTCPeerConnection/icegatheringstatechange_event": {
+    "modified": "2020-10-15T22:21:36.115Z",
+    "contributors": [
+      "chansbro"
+    ]
+  },
   "conflicting/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL": {
     "modified": "2019-03-23T22:54:05.275Z",
     "contributors": [
diff --git a/files/ko/web/api/rtcpeerconnection/onicegatheringstatechange/index.html b/files/ko/conflicting/web/api/rtcpeerconnection/icegatheringstatechange_event/index.html
index 9831c5057c..c63e0af02f 100644
--- a/files/ko/web/api/rtcpeerconnection/onicegatheringstatechange/index.html
+++ b/files/ko/conflicting/web/api/rtcpeerconnection/icegatheringstatechange_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.onicegatheringstatechange
-slug: Web/API/RTCPeerConnection/onicegatheringstatechange
+slug: conflicting/Web/API/RTCPeerConnection/icegatheringstatechange_event
 translation_of: Web/API/RTCPeerConnection/onicegatheringstatechange
+original_slug: Web/API/RTCPeerConnection/onicegatheringstatechange
 ---
 <p>{{APIRef("WebRTC")}}{{SeeCompatTable}}</p>
 
diff --git a/files/ko/web/api/rtcpeerconnection/onconnectionstatechange/index.html b/files/ko/web/api/rtcpeerconnection/connectionstatechange_event/index.html
index a152ddf080..3547500e7b 100644
--- a/files/ko/web/api/rtcpeerconnection/onconnectionstatechange/index.html
+++ b/files/ko/web/api/rtcpeerconnection/connectionstatechange_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.onconnectionstatechange
-slug: Web/API/RTCPeerConnection/onconnectionstatechange
+slug: Web/API/RTCPeerConnection/connectionstatechange_event
 translation_of: Web/API/RTCPeerConnection/onconnectionstatechange
+original_slug: Web/API/RTCPeerConnection/onconnectionstatechange
 ---
 <p>{{APIRef("WebRTC")}}</p>
 
diff --git a/files/ko/web/api/rtcpeerconnection/ondatachannel/index.html b/files/ko/web/api/rtcpeerconnection/datachannel_event/index.html
index e93e2e4f14..706ebca78f 100644
--- a/files/ko/web/api/rtcpeerconnection/ondatachannel/index.html
+++ b/files/ko/web/api/rtcpeerconnection/datachannel_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.ondatachannel
-slug: Web/API/RTCPeerConnection/ondatachannel
+slug: Web/API/RTCPeerConnection/datachannel_event
 translation_of: Web/API/RTCPeerConnection/ondatachannel
+original_slug: Web/API/RTCPeerConnection/ondatachannel
 ---
 <p>{{APIRef("WebRTC")}}{{SeeCompatTable}}</p>
 
diff --git a/files/ko/web/api/rtcpeerconnection/onicecandidate/index.html b/files/ko/web/api/rtcpeerconnection/icecandidate_event/index.html
index a8c23acfc1..4a74784411 100644
--- a/files/ko/web/api/rtcpeerconnection/onicecandidate/index.html
+++ b/files/ko/web/api/rtcpeerconnection/icecandidate_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.onicecandidate
-slug: Web/API/RTCPeerConnection/onicecandidate
+slug: Web/API/RTCPeerConnection/icecandidate_event
 translation_of: Web/API/RTCPeerConnection/onicecandidate
+original_slug: Web/API/RTCPeerConnection/onicecandidate
 ---
 <p>{{APIRef("WebRTC")}}</p>
 
diff --git a/files/ko/web/api/rtcpeerconnection/ontrack/index.html b/files/ko/web/api/rtcpeerconnection/track_event/index.html
index d598a6194f..e3449ede3b 100644
--- a/files/ko/web/api/rtcpeerconnection/ontrack/index.html
+++ b/files/ko/web/api/rtcpeerconnection/track_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.ontrack
-slug: Web/API/RTCPeerConnection/ontrack
+slug: Web/API/RTCPeerConnection/track_event
 translation_of: Web/API/RTCPeerConnection/ontrack
+original_slug: Web/API/RTCPeerConnection/ontrack
 ---
 <div>{{APIRef("WebRTC")}}</div>
 
diff --git a/files/ko/web/api/serviceworker/onstatechange/index.html b/files/ko/web/api/serviceworker/statechange_event/index.html
index d6063f0445..aebeda7895 100644
--- a/files/ko/web/api/serviceworker/onstatechange/index.html
+++ b/files/ko/web/api/serviceworker/statechange_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: ServiceWorker.onstatechange
-slug: Web/API/ServiceWorker/onstatechange
+slug: Web/API/ServiceWorker/statechange_event
 translation_of: Web/API/ServiceWorker/onstatechange
+original_slug: Web/API/ServiceWorker/onstatechange
 ---
 <div>{{SeeCompatTable}}{{APIRef("Service Workers API")}}</div>
 
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index f852975d04..e5c5f6508b 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -717,8 +717,10 @@
 /pt-BR/docs/Web/HTTP/Gerenciamento_de_Conexão_em_HTTP_1.x	/pt-BR/docs/Web/HTTP/Connection_management_in_HTTP_1.x
 /pt-BR/docs/Web/HTTP/HTTP	/pt-BR/docs/Web/HTTP/Caching
 /pt-BR/docs/Web/HTTP/Headers/Conexão	/pt-BR/docs/Web/HTTP/Headers/Connection
+/pt-BR/docs/Web/HTTP/Headers/Cookie2	/pt-BR/docs/conflicting/Web/HTTP/Headers/Cookie
 /pt-BR/docs/Web/HTTP/Headers/Expira	/pt-BR/docs/Web/HTTP/Headers/Expires
 /pt-BR/docs/Web/HTTP/Headers/Localização	/pt-BR/docs/Web/HTTP/Headers/Location
+/pt-BR/docs/Web/HTTP/Headers/Set-Cookie2	/pt-BR/docs/conflicting/Web/HTTP/Headers/Set-Cookie
 /pt-BR/docs/Web/HTTP/Mensagens	/pt-BR/docs/Web/HTTP/Messages
 /pt-BR/docs/Web/HTTP/Redirecionamento	/pt-BR/docs/Web/HTTP/Redirections
 /pt-BR/docs/Web/JavaScript/Enumerabilidade_e_posse_de_propriedades	/pt-BR/docs/Web/JavaScript/Enumerability_and_ownership_of_properties
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index 26a483ad31..a16a54abbc 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -10539,12 +10539,6 @@
       "FernandoKGA"
     ]
   },
-  "Web/HTTP/Headers/Cookie2": {
-    "modified": "2020-10-15T22:29:27.166Z",
-    "contributors": [
-      "FernandoKGA"
-    ]
-  },
   "Web/HTTP/Headers/Cross-Origin-Resource-Policy": {
     "modified": "2020-10-15T22:29:30.347Z",
     "contributors": [
@@ -10805,12 +10799,6 @@
       "ooVictorFranco"
     ]
   },
-  "Web/HTTP/Headers/Set-Cookie2": {
-    "modified": "2020-10-15T22:31:37.734Z",
-    "contributors": [
-      "FernandoKGA"
-    ]
-  },
   "Web/HTTP/Headers/SourceMap": {
     "modified": "2020-10-15T22:20:50.501Z",
     "contributors": [
@@ -16507,6 +16495,18 @@
       "marcio1002"
     ]
   },
+  "conflicting/Web/HTTP/Headers/Cookie": {
+    "modified": "2020-10-15T22:29:27.166Z",
+    "contributors": [
+      "FernandoKGA"
+    ]
+  },
+  "conflicting/Web/HTTP/Headers/Set-Cookie": {
+    "modified": "2020-10-15T22:31:37.734Z",
+    "contributors": [
+      "FernandoKGA"
+    ]
+  },
   "conflicting/Web/JavaScript/Equality_comparisons_and_sameness": {
     "modified": "2019-03-23T23:25:15.038Z",
     "contributors": [
diff --git a/files/pt-br/web/http/headers/cookie2/index.html b/files/pt-br/conflicting/web/http/headers/cookie/index.html
index 9ef4fb6e17..6d33e9afac 100644
--- a/files/pt-br/web/http/headers/cookie2/index.html
+++ b/files/pt-br/conflicting/web/http/headers/cookie/index.html
@@ -1,6 +1,6 @@
 ---
 title: Cookie2
-slug: Web/HTTP/Headers/Cookie2
+slug: conflicting/Web/HTTP/Headers/Cookie
 tags:
   - Cabeçalho de requisição
   - HTTP
@@ -9,6 +9,7 @@ tags:
   - cabeçalho
   - requisição
 translation_of: Web/HTTP/Headers/Cookie2
+original_slug: Web/HTTP/Headers/Cookie2
 ---
 <div>{{HTTPSidebar}} {{obsolete_header}}</div>
 
diff --git a/files/pt-br/web/http/headers/set-cookie2/index.html b/files/pt-br/conflicting/web/http/headers/set-cookie/index.html
index b0dafc333c..4bde79adc9 100644
--- a/files/pt-br/web/http/headers/set-cookie2/index.html
+++ b/files/pt-br/conflicting/web/http/headers/set-cookie/index.html
@@ -1,6 +1,6 @@
 ---
 title: Set-Cookie2
-slug: Web/HTTP/Headers/Set-Cookie2
+slug: conflicting/Web/HTTP/Headers/Set-Cookie
 tags:
   - Cookies
   - HTTP
@@ -8,6 +8,7 @@ tags:
   - Referencia
   - cabeçalho
 translation_of: Web/HTTP/Headers/Set-Cookie2
+original_slug: Web/HTTP/Headers/Set-Cookie2
 ---
 <div>{{HTTPSidebar}} {{obsolete_header}}</div>
 
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index c9aa710795..1c06359a39 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -373,6 +373,7 @@
 /ru/docs/Web/API/PositionError	/ru/docs/Web/API/GeolocationPositionError
 /ru/docs/Web/API/PositionOptions	/ru/docs/conflicting/Web/API/Geolocation/getCurrentPosition
 /ru/docs/Web/API/RandomSource/getRandomValues	/ru/docs/Web/API/Crypto/getRandomValues
+/ru/docs/Web/API/ServiceWorker/onstatechange	/ru/docs/Web/API/ServiceWorker/statechange_event
 /ru/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent	/ru/docs/conflicting/Web/API/Pointer_events
 /ru/docs/Web/API/USB/onconnect	/ru/docs/Web/API/USB/connect_event
 /ru/docs/Web/API/USB/ondisconnect	/ru/docs/Web/API/USB/disconnect_event
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 17f599b98d..1bae2b40bf 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -10111,12 +10111,6 @@
       "sh7dm"
     ]
   },
-  "Web/API/ServiceWorker/onstatechange": {
-    "modified": "2020-10-15T22:25:53.618Z",
-    "contributors": [
-      "sh7dm"
-    ]
-  },
   "Web/API/ServiceWorker/scriptURL": {
     "modified": "2020-10-15T22:25:53.547Z",
     "contributors": [
@@ -10129,6 +10123,12 @@
       "sh7dm"
     ]
   },
+  "Web/API/ServiceWorker/statechange_event": {
+    "modified": "2020-10-15T22:25:53.618Z",
+    "contributors": [
+      "sh7dm"
+    ]
+  },
   "Web/API/ServiceWorkerContainer": {
     "modified": "2020-04-09T10:43:47.005Z",
     "contributors": [
diff --git a/files/ru/web/api/serviceworker/onstatechange/index.html b/files/ru/web/api/serviceworker/statechange_event/index.html
index d7b171e887..b03607e229 100644
--- a/files/ru/web/api/serviceworker/onstatechange/index.html
+++ b/files/ru/web/api/serviceworker/statechange_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: ServiceWorker.onstatechange
-slug: Web/API/ServiceWorker/onstatechange
+slug: Web/API/ServiceWorker/statechange_event
 translation_of: Web/API/ServiceWorker/onstatechange
+original_slug: Web/API/ServiceWorker/onstatechange
 ---
 <div>{{APIRef("Service Workers API")}}</div>
 
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 3b9ee0afb5..aa184cbb38 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1483,6 +1483,10 @@
 /zh-CN/docs/Web/API/PositionOptions	/zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition
 /zh-CN/docs/Web/API/PositionOptions/timeout	/zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6
 /zh-CN/docs/Web/API/RTCConfiguration	/zh-CN/docs/conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
+/zh-CN/docs/Web/API/RTCPeerConnection/onaddstream	/zh-CN/docs/Web/API/RTCPeerConnection/addstream_event
+/zh-CN/docs/Web/API/RTCPeerConnection/ondatachannel	/zh-CN/docs/Web/API/RTCPeerConnection/datachannel_event
+/zh-CN/docs/Web/API/RTCPeerConnection/onicecandidate	/zh-CN/docs/conflicting/Web/API/RTCPeerConnection/icecandidate_event
+/zh-CN/docs/Web/API/RTCPeerConnection/ontrack	/zh-CN/docs/Web/API/RTCPeerConnection/track_event
 /zh-CN/docs/Web/API/RandomSource/getRandomValues	/zh-CN/docs/Web/API/Crypto/getRandomValues
 /zh-CN/docs/Web/API/Response/克隆	/zh-CN/docs/Web/API/Response/clone
 /zh-CN/docs/Web/API/SVGPathElement/getTotalLength	/zh-CN/docs/Web/API/SVGGeometryElement/getTotalLength
@@ -1503,6 +1507,7 @@
 /zh-CN/docs/Web/API/Selection.isCollapsed	/zh-CN/docs/Web/API/Selection/isCollapsed
 /zh-CN/docs/Web/API/Selection.removeRange	/zh-CN/docs/Web/API/Selection/removeRange
 /zh-CN/docs/Web/API/Selection/从Document中删除	/zh-CN/docs/Web/API/Selection/deleteFromDocument
+/zh-CN/docs/Web/API/ServiceWorker/onstatechange	/zh-CN/docs/Web/API/ServiceWorker/statechange_event
 /zh-CN/docs/Web/API/ServiceWorkerGlobalScope/caches	/zh-CN/docs/conflicting/Web/API/caches
 /zh-CN/docs/Web/API/StorageEstimate	/zh-CN/docs/conflicting/Web/API/StorageManager/estimate
 /zh-CN/docs/Web/API/Streams_API/使用可读文件流	/zh-CN/docs/Web/API/Streams_API/Using_readable_streams
@@ -2048,6 +2053,8 @@
 /zh-CN/docs/Web/HTTP/Headers/Content-Security-Policy__by_cnvoid/require-sri-for	/zh-CN/docs/Web/HTTP/Headers/Content-Security-Policy/require-sri-for
 /zh-CN/docs/Web/HTTP/Headers/Content-Security-Policy__by_cnvoid/sandbox	/zh-CN/docs/Web/HTTP/Headers/Content-Security-Policy/sandbox
 /zh-CN/docs/Web/HTTP/Headers/Content-Security-Policy__by_cnvoid/upgrade-insecure-requests	/zh-CN/docs/Web/HTTP/Headers/Content-Security-Policy/upgrade-insecure-requests
+/zh-CN/docs/Web/HTTP/Headers/Cookie2	/zh-CN/docs/conflicting/Web/HTTP/Headers/Cookie
+/zh-CN/docs/Web/HTTP/Headers/Set-Cookie2	/zh-CN/docs/conflicting/Web/HTTP/Headers/Set-Cookie
 /zh-CN/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file	/zh-CN/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_PAC_file
 /zh-CN/docs/Web/HTTP/Response_codes	/zh-CN/docs/Web/HTTP/Status
 /zh-CN/docs/Web/HTTP/Response_codes/100	/zh-CN/docs/Web/HTTP/Status/100
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 4dcfa7ff44..a748dafa8d 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -18720,6 +18720,12 @@
       "Mr.Chenzm"
     ]
   },
+  "Web/API/RTCPeerConnection/addstream_event": {
+    "modified": "2019-03-23T22:57:28.674Z",
+    "contributors": [
+      "starsun"
+    ]
+  },
   "Web/API/RTCPeerConnection/canTrickleIceCandidates": {
     "modified": "2020-10-15T22:17:37.803Z",
     "contributors": [
@@ -18752,6 +18758,12 @@
       "SDUTWSL"
     ]
   },
+  "Web/API/RTCPeerConnection/datachannel_event": {
+    "modified": "2019-03-23T22:21:43.126Z",
+    "contributors": [
+      "physihan"
+    ]
+  },
   "Web/API/RTCPeerConnection/getReceivers": {
     "modified": "2020-10-15T22:34:32.923Z",
     "contributors": [
@@ -18778,30 +18790,6 @@
       "BillgoXu"
     ]
   },
-  "Web/API/RTCPeerConnection/onaddstream": {
-    "modified": "2019-03-23T22:57:28.674Z",
-    "contributors": [
-      "starsun"
-    ]
-  },
-  "Web/API/RTCPeerConnection/ondatachannel": {
-    "modified": "2019-03-23T22:21:43.126Z",
-    "contributors": [
-      "physihan"
-    ]
-  },
-  "Web/API/RTCPeerConnection/onicecandidate": {
-    "modified": "2020-10-15T22:21:52.694Z",
-    "contributors": [
-      "babaiwan"
-    ]
-  },
-  "Web/API/RTCPeerConnection/ontrack": {
-    "modified": "2019-03-18T21:45:45.168Z",
-    "contributors": [
-      "track_vovo"
-    ]
-  },
   "Web/API/RTCPeerConnection/peerIdentity": {
     "modified": "2020-10-15T22:23:54.416Z",
     "contributors": [
@@ -18833,6 +18821,12 @@
       "w05163"
     ]
   },
+  "Web/API/RTCPeerConnection/track_event": {
+    "modified": "2019-03-18T21:45:45.168Z",
+    "contributors": [
+      "track_vovo"
+    ]
+  },
   "Web/API/RTCRtpTransceiver": {
     "modified": "2020-10-15T22:34:39.974Z",
     "contributors": [
@@ -19732,12 +19726,6 @@
       "marsoln"
     ]
   },
-  "Web/API/ServiceWorker/onstatechange": {
-    "modified": "2019-03-23T22:08:26.258Z",
-    "contributors": [
-      "fanyer"
-    ]
-  },
   "Web/API/ServiceWorker/scriptURL": {
     "modified": "2019-03-23T22:08:31.728Z",
     "contributors": [
@@ -19750,6 +19738,12 @@
       "fanyer"
     ]
   },
+  "Web/API/ServiceWorker/statechange_event": {
+    "modified": "2019-03-23T22:08:26.258Z",
+    "contributors": [
+      "fanyer"
+    ]
+  },
   "Web/API/ServiceWorkerContainer": {
     "modified": "2019-03-23T22:22:40.555Z",
     "contributors": [
@@ -33666,12 +33660,6 @@
       "WayneCui"
     ]
   },
-  "Web/HTTP/Headers/Cookie2": {
-    "modified": "2020-10-15T21:54:52.521Z",
-    "contributors": [
-      "WayneCui"
-    ]
-  },
   "Web/HTTP/Headers/Cross-Origin-Embedder-Policy": {
     "modified": "2020-10-15T22:33:37.678Z",
     "contributors": [
@@ -34006,12 +33994,6 @@
       "tinaawang"
     ]
   },
-  "Web/HTTP/Headers/Set-Cookie2": {
-    "modified": "2020-10-15T21:54:57.437Z",
-    "contributors": [
-      "WayneCui"
-    ]
-  },
   "Web/HTTP/Headers/SourceMap": {
     "modified": "2020-10-15T21:55:30.390Z",
     "contributors": [
@@ -47167,6 +47149,12 @@
       "moshoujingli"
     ]
   },
+  "conflicting/Web/API/RTCPeerConnection/icecandidate_event": {
+    "modified": "2020-10-15T22:21:52.694Z",
+    "contributors": [
+      "babaiwan"
+    ]
+  },
   "conflicting/Web/API/StorageManager/estimate": {
     "modified": "2019-03-18T21:31:04.064Z",
     "contributors": [
@@ -47610,6 +47598,18 @@
       "ziyunfei"
     ]
   },
+  "conflicting/Web/HTTP/Headers/Cookie": {
+    "modified": "2020-10-15T21:54:52.521Z",
+    "contributors": [
+      "WayneCui"
+    ]
+  },
+  "conflicting/Web/HTTP/Headers/Set-Cookie": {
+    "modified": "2020-10-15T21:54:57.437Z",
+    "contributors": [
+      "WayneCui"
+    ]
+  },
   "conflicting/Web/HTTP/Status": {
     "modified": "2019-01-16T13:20:30.376Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/rtcpeerconnection/onicecandidate/index.html b/files/zh-cn/conflicting/web/api/rtcpeerconnection/icecandidate_event/index.html
index a0efcfed3a..8759f7aada 100644
--- a/files/zh-cn/web/api/rtcpeerconnection/onicecandidate/index.html
+++ b/files/zh-cn/conflicting/web/api/rtcpeerconnection/icecandidate_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.onicecandidate
-slug: Web/API/RTCPeerConnection/onicecandidate
+slug: conflicting/Web/API/RTCPeerConnection/icecandidate_event
 translation_of: Web/API/RTCPeerConnection/onicecandidate
+original_slug: Web/API/RTCPeerConnection/onicecandidate
 ---
 <p>{{APIRef("WebRTC")}}</p>
 
diff --git a/files/zh-cn/web/http/headers/cookie2/index.html b/files/zh-cn/conflicting/web/http/headers/cookie/index.html
index 24699b5103..3b17451de1 100644
--- a/files/zh-cn/web/http/headers/cookie2/index.html
+++ b/files/zh-cn/conflicting/web/http/headers/cookie/index.html
@@ -1,11 +1,12 @@
 ---
 title: Cookie2
-slug: Web/HTTP/Headers/Cookie2
+slug: conflicting/Web/HTTP/Headers/Cookie
 tags:
   - 废弃
   - 请求首部
   - 首部
 translation_of: Web/HTTP/Headers/Cookie2
+original_slug: Web/HTTP/Headers/Cookie2
 ---
 <div>{{HTTPSidebar}} {{obsolete_header}}</div>
 
diff --git a/files/zh-cn/web/http/headers/set-cookie2/index.html b/files/zh-cn/conflicting/web/http/headers/set-cookie/index.html
index 117497bd4b..eab79f915f 100644
--- a/files/zh-cn/web/http/headers/set-cookie2/index.html
+++ b/files/zh-cn/conflicting/web/http/headers/set-cookie/index.html
@@ -1,10 +1,11 @@
 ---
 title: Set-Cookie2
-slug: Web/HTTP/Headers/Set-Cookie2
+slug: conflicting/Web/HTTP/Headers/Set-Cookie
 tags:
   - 废止
   - 首部
 translation_of: Web/HTTP/Headers/Set-Cookie2
+original_slug: Web/HTTP/Headers/Set-Cookie2
 ---
 <div>{{HTTPSidebar}} {{obsolete_header}}</div>
 
diff --git a/files/zh-cn/web/api/rtcpeerconnection/onaddstream/index.html b/files/zh-cn/web/api/rtcpeerconnection/addstream_event/index.html
index a61e2f28c6..25483657c8 100644
--- a/files/zh-cn/web/api/rtcpeerconnection/onaddstream/index.html
+++ b/files/zh-cn/web/api/rtcpeerconnection/addstream_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.onaddstream
-slug: Web/API/RTCPeerConnection/onaddstream
+slug: Web/API/RTCPeerConnection/addstream_event
 translation_of: Web/API/RTCPeerConnection/onaddstream
+original_slug: Web/API/RTCPeerConnection/onaddstream
 ---
 <p>{{APIRef("WebRTC")}}{{SeeCompatTable}}</p>
 
diff --git a/files/zh-cn/web/api/rtcpeerconnection/ondatachannel/index.html b/files/zh-cn/web/api/rtcpeerconnection/datachannel_event/index.html
index 73b9b136ed..921f9a0449 100644
--- a/files/zh-cn/web/api/rtcpeerconnection/ondatachannel/index.html
+++ b/files/zh-cn/web/api/rtcpeerconnection/datachannel_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.ondatachannel
-slug: Web/API/RTCPeerConnection/ondatachannel
+slug: Web/API/RTCPeerConnection/datachannel_event
 translation_of: Web/API/RTCPeerConnection/ondatachannel
+original_slug: Web/API/RTCPeerConnection/ondatachannel
 ---
 <p>{{APIRef("WebRTC")}}{{SeeCompatTable}}</p>
 
diff --git a/files/zh-cn/web/api/rtcpeerconnection/ontrack/index.html b/files/zh-cn/web/api/rtcpeerconnection/track_event/index.html
index 84c2b49cfe..0d121a93b6 100644
--- a/files/zh-cn/web/api/rtcpeerconnection/ontrack/index.html
+++ b/files/zh-cn/web/api/rtcpeerconnection/track_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCPeerConnection.ontrack
-slug: Web/API/RTCPeerConnection/ontrack
+slug: Web/API/RTCPeerConnection/track_event
 translation_of: Web/API/RTCPeerConnection/ontrack
+original_slug: Web/API/RTCPeerConnection/ontrack
 ---
 <p>{{APIRef("WebRTC")}}{{SeeCompatTable}}<code><strong>RTCPeerConnection.ontrack</strong></code> 属性是一个 {{event("Event_handlers", "event handler")}} 此属性指定了在{{domxref("RTCPeerConnection")}}接口上触发 {{event("track")}} 事件时调用的方法。该方法接收一个{{domxref("RTCTrackEvent")}}类型的event对象，该event对象将在{{domxref("MediaStreamTrack")}}被创建时或者是关联到已被添加到接收集合的{{domxref("RTCRtpReceiver")}}对象中时被发送。</p>
 
diff --git a/files/zh-cn/web/api/serviceworker/onstatechange/index.html b/files/zh-cn/web/api/serviceworker/statechange_event/index.html
index 94807435b2..c14f156198 100644
--- a/files/zh-cn/web/api/serviceworker/onstatechange/index.html
+++ b/files/zh-cn/web/api/serviceworker/statechange_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: ServiceWorker.onstatechange
-slug: Web/API/ServiceWorker/onstatechange
+slug: Web/API/ServiceWorker/statechange_event
 translation_of: Web/API/ServiceWorker/onstatechange
+original_slug: Web/API/ServiceWorker/onstatechange
 ---
 <div>{{SeeCompatTable}}{{APIRef("Service Workers API")}}</div>