diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6c5c5c98662..cd0ebb34fce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,13 +4,13 @@
 *help.yaml @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
 *help.yml @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
 
-/linter_exclusions.yml @naganandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
+/linter_exclusions.yml @naga-nandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
 
 /doc/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
-/tools/ @naganandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
-/tools/aaz-flow @a0x1ab @necusjz @yanzhudd @naganandyala
-/scripts/ @naganandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
-/scripts/live_test @naganandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
+/tools/ @naga-nandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
+/tools/aaz-flow @a0x1ab @necusjz @yanzhudd @naga-nandyala
+/scripts/ @naga-nandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
+/scripts/live_test @naga-nandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
 /src/azure-cli-testsdk/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan @bebound @jiasli
 
 /src/azure-cli-core/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan @bebound @jiasli
@@ -66,6 +66,6 @@
 /src/azure-cli/azure/cli/command_modules/sql/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy @jaredmoo
 /src/azure-cli/azure/cli/command_modules/storage/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy
 /src/azure-cli/azure/cli/command_modules/synapse/ @VeryEarly @Pan-Qi @jsntcy @idear1203 @zesluo @calvinhzy
-/src/azure-cli/azure/cli/command_modules/util/ @naganandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
+/src/azure-cli/azure/cli/command_modules/util/ @naga-nandyala @YanaXu @yonzhan @wangzelin007 @bebound @jiasli
 /src/azure-cli/azure/cli/command_modules/vm/ @NoriZC @yanzhudd @teresaritorto @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
 /src/azure-cli/azure/cli/command_modules/containerapp/ @NoriZC @yanzhudd @teresaritorto @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu