diff --git a/pkg/gui/commit_message_panel.go b/pkg/gui/commit_message_panel.go
index 2e3d2edb7..5f4fa8069 100644
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -10,7 +10,7 @@ import (
 
 func (gui *Gui) handleCommitConfirm() error {
 	message := strings.TrimSpace(gui.Views.CommitMessage.TextArea.GetContent())
-	gui.State.messageFailedCommit = message
+	gui.State.failedCommitMessage = message
 	if message == "" {
 		return gui.createErrorPanel(gui.Tr.CommitWithoutMessageErr)
 	}
@@ -30,7 +30,7 @@ func (gui *Gui) handleCommitConfirm() error {
 	_ = gui.returnFromContext()
 	return gui.withGpgHandling(cmdObj, gui.Tr.CommittingStatus, func() error {
 		gui.Views.CommitMessage.ClearTextArea()
-		gui.State.messageFailedCommit = ""
+		gui.State.failedCommitMessage = ""
 		return nil
 	})
 }
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index ea897f085..2c7cd2a3a 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -386,9 +386,9 @@ func (gui *Gui) handleCommitPress() error {
 		return gui.promptToStageAllAndRetry(gui.handleCommitPress)
 	}
 
-	if len(gui.State.messageFailedCommit) > 0 {
+	if len(gui.State.failedCommitMessage) > 0 {
 		gui.Views.CommitMessage.ClearTextArea()
-		gui.Views.CommitMessage.TextArea.TypeString(gui.State.messageFailedCommit)
+		gui.Views.CommitMessage.TextArea.TypeString(gui.State.failedCommitMessage)
 		gui.Views.CommitMessage.RenderTextArea()
 	} else {
 		commitPrefixConfig := gui.commitPrefixConfigForRepo()
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index f0e9df536..d7217e9cb 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -348,7 +348,7 @@ type guiState struct {
 	FilesTrie *patricia.Trie
 
 	// this is the message of the last failed commit attempt
-	messageFailedCommit string
+	failedCommitMessage string
 }
 
 // reuseState determines if we pull the repo state from our repo state map or