diff --git a/include/script.h b/include/script.h
index 21f074303..a13b1834f 100644
--- a/include/script.h
+++ b/include/script.h
@@ -62,7 +62,7 @@ typedef struct ScriptEnvironment {
     SCRIPTCONTEXT *scriptContexts[3];
     MessageFormat *msgfmt;
     STRING *stringBuffer0;
-    STRING *strbuf2;
+    STRING *stringBuffer1;
     struct WaitingIconManager *unk_50;
     EngagedTrainer engagedTrainers[2];
     u16 specialVars[NUM_SPECIAL_VARS];
@@ -95,7 +95,7 @@ typedef enum ScriptEnvField {
     SCRIPTENV_SCRIPT_CONTEXT_2,
     SCRIPTENV_MESSAGE_FORMAT,
     SCRIPTENV_STRING_BUFFER_0,
-    SCRIPTENV_STRBUF2                         = 18,
+    SCRIPTENV_STRING_BUFFER_1,
     SCRIPTENV_WAITING_ICON                    = 19,
     SCRIPTENV_AC                              = 20,
     SCRIPTENV_GENERIC_WORK_PTR                = 21,
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 874a7b4e7..09c5ceab7 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -104,7 +104,7 @@ BOOL Task_RunScripts(TaskManager *taskman) {
         env->activeScriptContextCount = 1;
         env->msgfmt = MessageFormat_new_custom(8, 64, HEAP_ID_FIELDMAP);
         env->stringBuffer0 = String_ctor(1024, HEAP_ID_FIELDMAP);
-        env->strbuf2 = String_ctor(1024, HEAP_ID_FIELDMAP);
+        env->stringBuffer1 = String_ctor(1024, HEAP_ID_FIELDMAP);
         env->state++;
         // fallthrough
     case 1:
@@ -125,7 +125,7 @@ BOOL Task_RunScripts(TaskManager *taskman) {
             void (*callback)(FieldSystem *a0) = env->scrctx_end_cb;
             MessageFormat_delete(env->msgfmt);
             String_dtor(env->stringBuffer0);
-            String_dtor(env->strbuf2);
+            String_dtor(env->stringBuffer1);
             env->check = 0;
             FreeToHeap(env);
             if (callback != NULL) {
@@ -251,8 +251,8 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv
         return &environment->msgfmt;
     case SCRIPTENV_STRING_BUFFER_0:
         return &environment->stringBuffer0;
-    case SCRIPTENV_STRBUF2:
-        return &environment->strbuf2;
+    case SCRIPTENV_STRING_BUFFER_1:
+        return &environment->stringBuffer1;
     case SCRIPTENV_WAITING_ICON:
         return &environment->unk_50;
     case SCRIPTENV_AC:
diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c
index 5d6f53510..93e2a9156 100644
--- a/src/scrcmd_c.c
+++ b/src/scrcmd_c.c
@@ -766,7 +766,7 @@ BOOL ScrCmd_DirectionSignpost(SCRIPTCONTEXT* ctx) {
     u8 unk2;
 
     FieldSystem* fsys = ctx->fsys;
-    STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2);
+    STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1);
     STRING** unk1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0);
     MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
     u8 msg_no = ScriptReadByte(ctx);
@@ -827,7 +827,7 @@ static BOOL sub_02041520(SCRIPTCONTEXT* ctx);
 BOOL ScrCmd_TrainerTips(SCRIPTCONTEXT* ctx) {
     FieldSystem* fsys = ctx->fsys;
     u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER);
-    STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2);
+    STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1);
     STRING** unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0);
     MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
     u8 msg_no = ScriptReadByte(ctx);