diff --git a/llvm/CODE_OWNERS.TXT b/llvm/CODE_OWNERS.TXT
index af0c4f94f3f9..60969849656f 100644
--- a/llvm/CODE_OWNERS.TXT
+++ b/llvm/CODE_OWNERS.TXT
@@ -12,10 +12,6 @@ N: Joe Abbey
 E: jabbey@arxan.com
 D: LLVM Bitcode (lib/Bitcode/* include/llvm/Bitcode/*)
 
-N: Rafael Avila de Espindola
-E: rafael.espindola@gmail.com
-D: Gold plugin (tools/gold/*)
-
 N: Justin Bogner
 E: mail@justinbogner.com
 D: InstrProfiling and related parts of ProfileData
@@ -90,6 +86,10 @@ N: Lang Hames
 E: lhames@gmail.com
 D: MCJIT, RuntimeDyld and JIT event listeners, Orcish Warchief
 
+N: Teresa Johnson
+E: tejohnson@google.com
+D: Gold plugin (tools/gold/*)
+
 N: Galina Kistanova
 E: gkistanova@gmail.com
 D: LLVM Buildbot