diff --git a/p2p/OWNERS b/p2p/OWNERS
index 2721d67..cb1a208 100644
--- a/p2p/OWNERS
+++ b/p2p/OWNERS
@@ -1,4 +1,5 @@
-henrikg@webrtc.org
+deadbeef@webrtc.org
+honghaiz@webrtc.org
 hta@webrtc.org
 jiayl@webrtc.org
 juberti@webrtc.org
@@ -7,8 +8,6 @@
 pthatcher@webrtc.org
 sergeyu@chromium.org
 tommi@webrtc.org
-deadbeef@webrtc.org
-honghaiz@webrtc.org
 
 # These are for the common case of adding or renaming files. If you're doing
 # structural changes, please get a review from a reviewer in this file.
diff --git a/rtc_base/OWNERS b/rtc_base/OWNERS
index 9e8ef1f..f46838c 100644
--- a/rtc_base/OWNERS
+++ b/rtc_base/OWNERS
@@ -1,13 +1,12 @@
-henrikg@webrtc.org
+deadbeef@webrtc.org
 hta@webrtc.org
 juberti@webrtc.org
+kwiberg@webrtc.org
 mflodman@webrtc.org
 perkj@webrtc.org
 pthatcher@webrtc.org
 sergeyu@chromium.org
 tommi@webrtc.org
-deadbeef@webrtc.org
-kwiberg@webrtc.org
 
 # These are for the common case of adding or renaming files. If you're doing
 # structural changes, please get a review from a reviewer in this file.
diff --git a/rtc_base/stringencode.cc b/rtc_base/stringencode.cc
index 755cb2c..f2a1508 100644
--- a/rtc_base/stringencode.cc
+++ b/rtc_base/stringencode.cc
@@ -139,7 +139,7 @@
 size_t hex_encode_with_delimiter(char* buffer, size_t buflen,
                                  const char* csource, size_t srclen,
                                  char delimiter) {
-  RTC_DCHECK(buffer);  // TODO(grunell): estimate output size
+  RTC_DCHECK(buffer);  // TODO(kwiberg): estimate output size
   if (buflen == 0)
     return 0;
 
@@ -195,7 +195,7 @@
 size_t hex_decode_with_delimiter(char* cbuffer, size_t buflen,
                                  const char* source, size_t srclen,
                                  char delimiter) {
-  RTC_DCHECK(cbuffer);  // TODO(grunell): estimate output size
+  RTC_DCHECK(cbuffer);  // TODO(kwiberg): estimate output size
   if (buflen == 0)
     return 0;
 
diff --git a/system_wrappers/OWNERS b/system_wrappers/OWNERS
index 65b8dee..13b08a3 100644
--- a/system_wrappers/OWNERS
+++ b/system_wrappers/OWNERS
@@ -1,9 +1,8 @@
-perkj@webrtc.org
 henrika@webrtc.org
-henrikg@webrtc.org
 mflodman@webrtc.org
 niklas.enbom@webrtc.org
 nisse@webrtc.org
+perkj@webrtc.org
 
 # These are for the common case of adding or renaming files. If you're doing
 # structural changes, please get a review from a reviewer in this file.