diff --git a/src/ActionPanel.test.js b/src/ActionPanel.test.js
index 6a05b608..a7410288 100644
--- a/src/ActionPanel.test.js
+++ b/src/ActionPanel.test.js
@@ -238,7 +238,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 1
         });
         const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
-        const expectedAriaLabel = "Move Step 1 forward 1 square out of loop A";
+        const expectedAriaLabel = "Move Step 1 forward 1 square out before loop A";
         moveToPreviousStepButton.simulate('click');
         expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(mockMoveToPreviousStep.mock.calls.length).toBe(1);
@@ -259,7 +259,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 2
         });
         const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
-        const expectedAriaLabel = "Move Step 3 forward 1 square into loop A";
+        const expectedAriaLabel = "Move Step 3 forward 1 square into the end of loop A";
         moveToPreviousStepButton.simulate('click');
         expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(mockMoveToPreviousStep.mock.calls.length).toBe(1);
@@ -448,7 +448,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 1
         });
         const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
-        const expectedAriaLabel = "Move Step 1 forward 1 square out of loop A";
+        const expectedAriaLabel = "Move Step 1 forward 1 square out after loop A";
         moveToNextStepButton.simulate('click');
         expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(mockMoveToNextStep.mock.calls.length).toBe(1);
@@ -469,7 +469,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 0
         });
         const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
-        const expectedAriaLabel = "Move Step 1 forward 1 square into loop A";
+        const expectedAriaLabel = "Move Step 1 forward 1 square into the beginning of loop A";
         moveToNextStepButton.simulate('click');
         expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(mockMoveToNextStep.mock.calls.length).toBe(1);
diff --git a/src/messages.json b/src/messages.json
index b6daf503..675ed8a8 100644
--- a/src/messages.json
+++ b/src/messages.json
@@ -72,15 +72,15 @@
         "Command.right180": "turn right 180 degrees",
         "Command.startLoop": "beginning of loop {loopLabel}",
         "CommandInfo.previousStep": "before step {previousStepNumber} {command}",
-        "CommandInfo.previousStep.endLoop": "into loop {loopLabel}",
+        "CommandInfo.previousStep.endLoop": "into the end of loop {loopLabel}",
         "CommandInfo.previousStep.inLoop": "before step {previousStepNumber} {command} of loop {loopLabel}",
         "CommandInfo.previousStep.loop": "before step {previousStepNumber} {command}",
-        "CommandInfo.previousStep.startLoop": "out of loop {loopLabel}",
+        "CommandInfo.previousStep.startLoop": "out before loop {loopLabel}",
         "CommandInfo.nextStep": "after step {nextStepNumber} {command}",
-        "CommandInfo.nextStep.endLoop": "out of loop {loopLabel}",
+        "CommandInfo.nextStep.endLoop": "out after loop {loopLabel}",
         "CommandInfo.nextStep.inLoop": "after step {nextStepNumber} {command} of loop {loopLabel}",
         "CommandInfo.nextStep.loop": "after step {nextStepNumber} {command}",
-        "CommandInfo.nextStep.startLoop": "into loop {loopLabel}",
+        "CommandInfo.nextStep.startLoop": "into the beginning of loop {loopLabel}",
         "CommandPalette.controlsTitle": "Controls",
         "CommandPalette.movementsTitle": "Movements",
         "CommandPalette.shortMovementsTitle": "Move",