diff --git a/CODEOWNERS b/CODEOWNERS
index 5bee1ee19e53049f30a52c32dbe64e3bab35732b..22349e278ce93c9c39833386242f999628b5c975 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -17,10 +17,10 @@
 
 # The compiler
 /compiler/parser/                 @int-index
-/compiler/typecheck/              @simonpj @goldfire
-/compiler/rename/                 @simonpj @goldfire
-/compiler/types/                  @simonpj @goldfire
-/compiler/deSugar/                @simonpj @goldfire
+/compiler/typecheck/              @simonpj @rae
+/compiler/rename/                 @simonpj @rae
+/compiler/types/                  @simonpj @rae
+/compiler/deSugar/                @simonpj @rae
 /compiler/typecheck/TcDeriv*      @RyanGlScott
 /compiler/nativeGen/              @simonmar @bgamari @AndreasK
 /compiler/llvmGen/                @angerman
@@ -34,12 +34,12 @@
 /compiler/simplStg/StgLiftLams.hs @sgraf
 /compiler/cmm/CmmSwitch.hs        @nomeata
 /compiler/stranal/DmdAnal.hs      @simonpj @sgraf
-/compiler/hsSyn/Convert.hs        @goldfire
+/compiler/hsSyn/Convert.hs        @rae
 
 # Core libraries
 /libraries/base/                  @hvr
 /libraries/ghci/                  @simonmar
-/libraries/template-haskell/      @goldfire
+/libraries/template-haskell/      @rae
 
 # Internal utilities and libraries
 /libraries/libiserv/              @angerman @simonmar