diff --git a/tracker/action.go b/tracker/action.go
index 6158c8c..393d441 100644
--- a/tracker/action.go
+++ b/tracker/action.go
@@ -275,7 +275,7 @@ func (m *Model) RemoveUnused() Action {
 	})
 }
 
-func (m *Model) PlayFromCurrentPosition() Action {
+func (m *Model) PlayCurrentPos() Action {
 	return Action{
 		allowed: func() bool { return !m.instrEnlarged },
 		do: func() {
@@ -287,7 +287,7 @@ func (m *Model) PlayFromCurrentPosition() Action {
 	}
 }
 
-func (m *Model) PlayFromSongStart() Action {
+func (m *Model) PlaySongStart() Action {
 	return Action{
 		allowed: func() bool { return !m.instrEnlarged },
 		do: func() {
diff --git a/tracker/gioui/keyevent.go b/tracker/gioui/keyevent.go
index 82b8fda..89aa16b 100644
--- a/tracker/gioui/keyevent.go
+++ b/tracker/gioui/keyevent.go
@@ -149,16 +149,16 @@ func (t *Tracker) KeyEvent(e key.Event, gtx C) {
 		t.RemoveUnused().Do()
 	case "PlayCurrentPosFollow":
 		t.NoteTracking().Bool().Set(true)
-		t.PlayFromCurrentPosition().Do()
+		t.PlayCurrentPos().Do()
 	case "PlayCurrentPosUnfollow":
 		t.NoteTracking().Bool().Set(false)
-		t.PlayFromCurrentPosition().Do()
+		t.PlayCurrentPos().Do()
 	case "PlaySongStartFollow":
 		t.NoteTracking().Bool().Set(true)
-		t.PlayFromSongStart().Do()
+		t.PlaySongStart().Do()
 	case "PlaySongStartUnfollow":
 		t.NoteTracking().Bool().Set(false)
-		t.PlayFromSongStart().Do()
+		t.PlaySongStart().Do()
 	case "PlaySelectedFollow":
 		t.NoteTracking().Bool().Set(true)
 		t.PlaySelected().Do()
diff --git a/tracker/gioui/songpanel.go b/tracker/gioui/songpanel.go
index eb21369..02eb65c 100644
--- a/tracker/gioui/songpanel.go
+++ b/tracker/gioui/songpanel.go
@@ -64,7 +64,7 @@ func NewSongPanel(model *tracker.Model) *SongPanel {
 		RecordBtn:      NewBoolClickable(model.IsRecording().Bool()),
 		NoteTracking:   NewBoolClickable(model.NoteTracking().Bool()),
 		PlayingBtn:     NewBoolClickable(model.Playing().Bool()),
-		RewindBtn:      NewActionClickable(model.PlayFromSongStart()),
+		RewindBtn:      NewActionClickable(model.PlaySongStart()),
 	}
 	ret.fileMenuItems = []MenuItem{
 		{IconBytes: icons.ContentClear, Text: "New Song", ShortcutText: keyActionMap["NewSong"], Doer: model.NewSong()},
diff --git a/tracker/model_test.go b/tracker/model_test.go
index 71a3993..c97287a 100644
--- a/tracker/model_test.go
+++ b/tracker/model_test.go
@@ -82,7 +82,7 @@ func (s *modelFuzzState) Iterate(yield func(string, func(p string, t *testing.T)
 	s.IterateAction("AddOctave", s.model.AddOctave(), yield, seed)
 	s.IterateAction("SubtractOctave", s.model.SubtractOctave(), yield, seed)
 	s.IterateAction("EditNoteOff", s.model.EditNoteOff(), yield, seed)
-	s.IterateAction("Rewind", s.model.PlayFromSongStart(), yield, seed)
+	s.IterateAction("PlaySongStart", s.model.PlaySongStart(), yield, seed)
 	s.IterateAction("AddOrderRowAfter", s.model.AddOrderRow(false), yield, seed)
 	s.IterateAction("AddOrderRowBefore", s.model.AddOrderRow(true), yield, seed)
 	s.IterateAction("DeleteOrderRowForward", s.model.DeleteOrderRow(false), yield, seed)