diff --git a/completions/_git-forgit b/completions/_git-forgit
index 434c161..c85bcd5 100644
--- a/completions/_git-forgit
+++ b/completions/_git-forgit
@@ -92,14 +92,14 @@ _git-forgit() {
     cherry_pick_from_branch) _git-branches ;;
     clean) _git-clean ;;
     diff) _git-forgit-diff ;;
-    fixup) __git_branch_names ;;
+    fixup) _git-log ;;
     log) _git-log ;;
     reflog) _git-forgit-reflog ;;
     rebase) _git-rebase ;;
     reset_head) _git-staged ;;
     revert_commit) __git_recent_commits ;;
-    reword) __git_branch_names ;;
-    squash) __git_branch_names ;;
+    reword) _git-log ;;
+    squash) _git-log ;;
     stash_show) _git-stash-show ;;
     show) _git-show ;;
     esac
@@ -120,14 +120,14 @@ compdef _git-cherry-pick forgit::cherry::pick
 compdef _git-branches forgit::cherry::pick::from::branch
 compdef _git-clean forgit::clean
 compdef _git-forgit-diff forgit::diff
-compdef __git_branch_names forgit::fixup
+compdef _git-log forgit::fixup
 compdef _git-log forgit::log
 compdef _git-reflog forgit::reflog
 compdef _git-rebase forgit::rebase
 compdef _git-staged forgit::reset::head
 compdef __git_recent_commits forgit::revert::commit
-compdef __git_branch_names forgit::reword
-compdef __git_branch_names forgit::squash
+compdef _git-log forgit::reword
+compdef _git-log forgit::squash
 compdef _git-stash-show forgit::stash::show
 compdef _git-show forgit::show
 
diff --git a/completions/git-forgit.bash b/completions/git-forgit.bash
index 598a23b..47b81d1 100755
--- a/completions/git-forgit.bash
+++ b/completions/git-forgit.bash
@@ -98,15 +98,15 @@ _git_forgit()
                 cherry_pick_from_branch) _git_checkout_branch ;;
                 clean) _git_clean ;;
                 diff) _git_diff ;;
-                fixup) _git_branch ;;
+                fixup) _git_log ;;
                 log) _git_log ;;
                 reflog) _git_reflog ;;
                 rebase) _git_rebase ;;
                 reset_head) _git_reset ;;
                 revert_commit) _git_revert ;;
-                reword) _git_branch ;;
+                reword) _git_log ;;
                 show) _git_show ;;
-                squash) _git_branch ;;
+                squash) _git_log ;;
                 stash_show) _git_stash_show ;;
             esac
             ;;
@@ -135,15 +135,15 @@ then
     __git_complete forgit::cherry::pick::from::branch _git_checkout_branch
     __git_complete forgit::clean _git_clean
     __git_complete forgit::diff _git_diff
-    __git_complete forgit::fixup _git_branch
+    __git_complete forgit::fixup _git_log
     __git_complete forgit::log _git_log
     __git_complete forgit::reflog _git_reflog
     __git_complete forgit::rebase _git_rebase
     __git_complete forgit::reset::head _git_reset
     __git_complete forgit::revert::commit _git_revert
-    __git_complete forgit::reword _git_branch
+    __git_complete forgit::reword _git_log
     __git_complete forgit::show _git_show
-    __git_complete forgit::squash _git_branch
+    __git_complete forgit::squash _git_log
     __git_complete forgit::stash::show _git_stash_show
 
     # Completion for forgit plugin shell aliases
@@ -157,15 +157,15 @@ then
         __git_complete "${forgit_cherry_pick}" _git_checkout_branch
         __git_complete "${forgit_clean}" _git_clean
         __git_complete "${forgit_diff}" _git_diff
-        __git_complete "${forgit_fixup}" _git_branch
+        __git_complete "${forgit_fixup}" _git_log
         __git_complete "${forgit_log}" _git_log
         __git_complete "${forgit_reflog}" _git_reflog
         __git_complete "${forgit_rebase}" _git_rebase
         __git_complete "${forgit_reset_head}" _git_reset
         __git_complete "${forgit_revert_commit}" _git_revert
-        __git_complete "${forgit_reword}" _git_branch
+        __git_complete "${forgit_reword}" _git_log
         __git_complete "${forgit_show}" _git_show
-        __git_complete "${forgit_squash}" _git_branch
+        __git_complete "${forgit_squash}" _git_log
         __git_complete "${forgit_stash_show}" _git_stash_show
     fi
 fi
diff --git a/completions/git-forgit.fish b/completions/git-forgit.fish
index 7876e88..31fb3ad 100644
--- a/completions/git-forgit.fish
+++ b/completions/git-forgit.fish
@@ -55,14 +55,14 @@ complete -c git-forgit -n '__fish_seen_subcommand_from checkout_tag' -a "(__fish
 complete -c git-forgit -n '__fish_seen_subcommand_from cherry_pick' -a "(complete -C 'git cherry-pick ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from clean' -a "(__fish_git_files untracked ignored)"
 complete -c git-forgit -n '__fish_seen_subcommand_from diff' -a "(complete -C 'git diff ')"
-complete -c git-forgit -n '__fish_seen_subcommand_from fixup' -a "(__fish_git_local_branches)"
+complete -c git-forgit -n '__fish_seen_subcommand_from fixup' -a "(complete -C 'git log ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from log' -a "(complete -C 'git log ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from reflog' -a "(complete -C 'git reflog ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from rebase' -a "(complete -C 'git rebase ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from reset_head' -a "(__fish_git_files all-staged)"
 complete -c git-forgit -n '__fish_seen_subcommand_from revert_commit' -a "(__fish_git_commits)"
-complete -c git-forgit -n '__fish_seen_subcommand_from reword' -a "(__fish_git_local_branches)"
+complete -c git-forgit -n '__fish_seen_subcommand_from reword' -a "(complete -C 'git log ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from show' -a "(complete -C 'git show ')"
-complete -c git-forgit -n '__fish_seen_subcommand_from squash' -a "(__fish_git_local_branches)"
+complete -c git-forgit -n '__fish_seen_subcommand_from squash' -a "(complete -C 'git log ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from stash_show' -a "(__fish_git_complete_stashes)"
 complete -c git-forgit -n '__fish_seen_subcommand_from stash_push' -a "(__fish_git_files modified deleted modified-staged-deleted)"