diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3421d521f7..1f11809533 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,19 +8,19 @@ node/src/main/kotlin/net/corda/node/internal    @rick-r3
 node/src/main/kotlin/net/corda/node/services    @rick-r3
 
 # Demobench defaults to Chris, but Viktor for the main code
-tools/demobench @chrisr3
+tools/demobench @rick-r3
 
 # General Corda code
 
 core/src/main/kotlin/net/corda/core/flows	@rick-r3
-core/src/main/kotlin/net/corda/core/internal/notary	@corda/notaries
+core/src/main/kotlin/net/corda/core/internal/notary	@rick-r3
 
 node/src/integration-test/kotlin/net/corda/node/persistence	@chriscochrane
 node/src/integration-test/kotlin/net/corda/node/services/persistence	@chriscochrane
 node/src/main/kotlin/net/corda/node/services/messaging	@rick-r3
 node/src/main/kotlin/net/corda/node/services/persistence	@rick-r3
 node/src/main/kotlin/net/corda/node/services/statemachine	@rick-r3
-node/src/main/kotlin/net/corda/notary	@corda/notaries
+node/src/main/kotlin/net/corda/notary	@rick-r3
 
 node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence	@rick-r3