diff --git a/CODEOWNERS b/CODEOWNERS
index 3157c42..7ebd986 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -23,35 +23,35 @@
 #-----------------------------------------------------------------
 # Serialization
 #-----------------------------------------------------------------
-geode-serialization/**                                            @bschuchardt @Bill
+geode-serialization/**                                            @echobravopapa @Bill
 geode-core/**/org/apache/geode/pdx/**                             @upthewaterspout @dschneider-pivotal @agingade
-geode-core/**/org/apache/geode/internal/*                         @bschuchardt @Bill @kirklund
+geode-core/**/org/apache/geode/internal/*                         @echobravopapa @Bill @kirklund
 
 #-----------------------------------------------------------------
 # Membership
 #-----------------------------------------------------------------
-geode-membership/**                                               @bschuchardt @Bill
-geode-old-client-support/**                                       @bschuchardt @Bill
-geode-tcp-server/**                                               @bschuchardt @Bill
-geode-core/**/org/apache/geode/distributed/internal/membership/** @bschuchardt @Bill
+geode-membership/**                                               @echobravopapa @Bill
+geode-old-client-support/**                                       @echobravopapa @Bill
+geode-tcp-server/**                                               @echobravopapa @Bill
+geode-core/**/org/apache/geode/distributed/internal/membership/** @echobravopapa @Bill
 
 #-----------------------------------------------------------------
 # P2P Messaging
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/internal/tcp/**                    @bschuchardt @Bill
-geode-core/**/org/apache/geode/distributed/internal/direct/**     @bschuchardt @Bill
-geode-core/**/org/apache/geode/internal/net/**                    @bschuchardt @Bill
+geode-core/**/org/apache/geode/internal/tcp/**                    @echobravopapa @Bill
+geode-core/**/org/apache/geode/distributed/internal/direct/**     @echobravopapa @Bill
+geode-core/**/org/apache/geode/internal/net/**                    @echobravopapa @Bill
 geode-core/**/org/apache/geode/net/**                             @Bill @mivanac
-geode-core/**/org/apache/geode/distributed/*                      @bschuchardt @Bill @kirklund
-geode-core/**/org/apache/geode/distributed/internal/*             @bschuchardt @Bill @kirklund
+geode-core/**/org/apache/geode/distributed/*                      @echobravopapa @Bill @kirklund
+geode-core/**/org/apache/geode/distributed/internal/*             @echobravopapa @Bill @kirklund
 
 #-----------------------------------------------------------------
 # Client/server messaging and cache operations
 #-----------------------------------------------------------------
-geode-core/**/org/apache/geode/cache/client/**                    @bschuchardt @Bill @kirklund
-geode-core/**/org/apache/geode/cache/server/**                    @bschuchardt @Bill @kirklund
-geode-core/**/org/apache/geode/internal/cache/client/**           @bschuchardt @echobravopapa
-geode-core/**/org/apache/geode/internal/cache/tier/**             @bschuchardt @echobravopapa @agingade
+geode-core/**/org/apache/geode/cache/client/**                    @echobravopapa @Bill @kirklund
+geode-core/**/org/apache/geode/cache/server/**                    @echobravopapa @Bill @kirklund
+geode-core/**/org/apache/geode/internal/cache/client/**           @Bill @echobravopapa
+geode-core/**/org/apache/geode/internal/cache/tier/**             @Bill @echobravopapa @agingade
 
 #-----------------------------------------------------------------
 # Client Queues