diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fc86ae1b7..badfb7b26 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -15,7 +15,7 @@ alias gpr='git pull --rebase'
 compdef _git gpr=git-pull
 alias gp='git push'
 compdef _git gp=git-push
-alias gf='git fetch --all'
+alias gf='git fetch'
 compdef _git gf='git-fetch'
 alias gfa='git fetch --all'
 compdef _git gfa='git-fetch'
@@ -41,18 +41,18 @@ alias gcm='git checkout master'
 compdef _git gcm=git-checkout
 alias grm='git rebase master'
 compdef _git grm=git-rebase
-alias gr='git remote'
-compdef _git gr=git-remote
-alias grv='git remote -v'
+alias gre='git remote'
+compdef _git gre=git-remote
+alias grev='git remote -v'
 compdef _git grv=git-remote
-alias grmv='git remote rename'
-compdef _git grmv=git-remote
-alias grrm='git remote remove'
+alias gremv='git remote rename'
+compdef _git gremv=git-remote
+alias grerm='git remote remove'
 compdef _git grrm=git-remote
-alias grset='git remote set-url'
-compdef _git grset=git-remote
-alias grup='git remote update'
-compdef _git grset=git-remote
+alias greset='git remote set-url'
+compdef _git greset=git-remote
+alias greup='git remote update'
+compdef _git greset=git-remote
 alias gr='git rebase -i'
 compdef _git gr=git-rebase
 alias grc='git rebase --continue'