diff --git a/src/glue.launch.a b/src/glue.launch.a
index 030161c72..c9b8838aa 100644
--- a/src/glue.launch.a
+++ b/src/glue.launch.a
@@ -71,17 +71,17 @@ _gameToLaunchExit
 ;------------------------------------------------------------------------------
 FindGameInActionSlideshow
          +ST16 gLastMegaAttractGame
-         jsr   okvs_get_current      ; (PTR) -> OKVS value (filename or empty string)
+         jsr   okvs_next_field       ; (PTR) -> OKVS value (filename or empty string)
                                      ; Y=0
          lda   (PTR), y
          beq   +
          +LD16 PTR
          +ST16 gLastMegaAttractGame
-+        jsr   okvs_get_current_PTR_is_already_set ; (PTR) -> game display name
++        jsr   okvs_next_field_PTR_is_already_set ; (PTR) -> game display name
          +LD16 PTR                   ; A/Y -> game display name
          +ST16 SAVE                  ; (SAVE) -> game display name
 FindGame
-         jsr   okvs_get_current      ; (PTR) -> game requirements bitfield
+         jsr   okvs_next_field       ; (PTR) -> game requirements bitfield
                                      ; Y=0
 
          ; check if game requires joystick
diff --git a/src/okvs.a b/src/okvs.a
index 28004e128..c4d878d75 100644
--- a/src/okvs.a
+++ b/src/okvs.a
@@ -168,7 +168,7 @@ KEYLEN = *+1
          clc
 @maybeGetValue
          brk                         ; SMC
-         jsr   okvs_get_current
+         jsr   okvs_next_field
          +LD16 PTR
          clc
          rts
@@ -384,10 +384,10 @@ okvs_iter_values
 ;------------------------------------------------------------------------------
 ; internal functions
 
-okvs_get_current
+okvs_next_field
 ; out:   Y = 0
          +ST16 PTR
-okvs_get_current_PTR_is_already_set
+okvs_next_field_PTR_is_already_set
          jsr   stepptr
          bne   incptr
 
diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a
index df13594e0..e21f5f4cf 100644
--- a/src/ui.attract.mode.a
+++ b/src/ui.attract.mode.a
@@ -77,7 +77,7 @@ MiniAttractMode
          jsr   okvs_find
          !word -
 +        !word $FDFD                 ; SMC
-         jsr   okvs_get_current
+         jsr   okvs_next_field
          jsr   SwitchToBank2
          sty   OKVS_CACHE
          ldy   #4
@@ -113,7 +113,7 @@ MiniAttractMode
          +LDADDR -
          jsr   okvs_nth              ; get the next module on the list
          +ST16 SAVE
-         jsr   okvs_get_current      ; get module type
+         jsr   okvs_next_field       ; get module type
                                      ; Y = 0
          iny
          lda   (PTR),y
diff --git a/src/ui.offscreen.a b/src/ui.offscreen.a
index 82895c5da..b0dff464d 100644
--- a/src/ui.offscreen.a
+++ b/src/ui.offscreen.a
@@ -88,8 +88,8 @@ LoadGameTitleOffscreen
          +ST16 @fname
          bit   MachineStatus         ; if < 128K, don't bother checking for DHGR title
          bvc   @hgr
-         jsr   okvs_get_current
-         jsr   okvs_get_current_PTR_is_already_set
+         jsr   okvs_next_field
+         jsr   okvs_next_field_PTR_is_already_set
                                      ; (PTR) -> length-prefixed game info bitfield
                                      ; Y = 0
          iny                         ; Y = 1
diff --git a/src/ui.overlay.a b/src/ui.overlay.a
index e6f70accf..6361893ee 100644
--- a/src/ui.overlay.a
+++ b/src/ui.overlay.a
@@ -125,7 +125,7 @@ DrawUI
          jsr   GetGameToLaunch       ; get current game, if any
          bcs   @doneWithLine2        ; if no game, nothing more to do on UI line 2
                                      ; A/Y -> key of current game (in gSearchStore)
-         jsr   okvs_get_current      ; (PTR) -> display name of current game
+         jsr   okvs_next_field       ; (PTR) -> display name of current game
                                      ; Y = 0
          lda   (PTR), y
          tay