diff --git a/pkg/commands/git_commands/file_loader.go b/pkg/commands/git_commands/file_loader.go
index bb898d06a..92a011f63 100644
--- a/pkg/commands/git_commands/file_loader.go
+++ b/pkg/commands/git_commands/file_loader.go
@@ -110,8 +110,8 @@ type FileDiff struct {
 	LinesDeleted int
 }
 
-func (fileLoader *FileLoader) getFileDiffs() (map[string]FileDiff, error) {
-	diffs, err := fileLoader.gitDiffNumStat()
+func (self *FileLoader) getFileDiffs() (map[string]FileDiff, error) {
+	diffs, err := self.gitDiffNumStat()
 	if err != nil {
 		return nil, err
 	}
@@ -157,8 +157,8 @@ type FileStatus struct {
 	PreviousPath string
 }
 
-func (fileLoader *FileLoader) gitDiffNumStat() (string, error) {
-	return fileLoader.cmd.New(
+func (self *FileLoader) gitDiffNumStat() (string, error) {
+	return self.cmd.New(
 		NewGitCmd("diff").
 			Arg("--numstat").
 			Arg("-z").
diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go
index bc56c5110..8de96b249 100644
--- a/pkg/tasks/tasks.go
+++ b/pkg/tasks/tasks.go
@@ -75,8 +75,8 @@ type LinesToRead struct {
 	Then func()
 }
 
-func (m *ViewBufferManager) GetTaskKey() string {
-	return m.taskKey
+func (self *ViewBufferManager) GetTaskKey() string {
+	return self.taskKey
 }
 
 func NewViewBufferManager(