diff --git a/src/blocks/tokens.ts b/src/blocks/tokens.ts
index 1afa5305..9e43b349 100644
--- a/src/blocks/tokens.ts
+++ b/src/blocks/tokens.ts
@@ -41,7 +41,7 @@ export function customTokens(t: (key: string) => string): typeof Blockly.Msg {
     EVENTS: t('BLOCKLY.EVENTS'),
     EVALUATE_BUT_IGNORE_RESULT: t('BLOCKLY.EVALUATE_BUT_IGNORE_RESULT'),
     EVALUATE_BUT_IGNORE_RESULT_TOOLTIP:
-      t('BLOCKLY.EVALUATE_BUT_IGNORE_RESULT_TOOLTIP'),
+      t('BLOCKLY.TOOLTIP.EVALUATE_BUT_IGNORE_RESULT'),
     AUTO: t('BLOCKLY.AUTO'),
     TELEOP: t('BLOCKLY.TELEOP'),
     TEST: t('BLOCKLY.TEST'),
@@ -50,10 +50,10 @@ export function customTokens(t: (key: string) => string): typeof Blockly.Msg {
     DISPLAY_NAME: t('BLOCKLY.DISPLAY_NAME'),
     DISPLAY_GROUP: t('BLOCKLY.DISPLAY_GROUP'),
     NO_MECHANISM_CONTENTS: t('BLOCKLY.NO_MECHANISM_CONTENTS'),
-    OPMODE_TYPE_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_TYPE_TOOLTIP'),
-    OPMODE_ENABLED_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_ENABLED_TOOLTIP'),
-    OPMODE_NAME_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_NAME_TOOLTIP'),
-    OPMODE_GROUP_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_GROUP_TOOLTIP'),
+    OPMODE_TYPE_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_TYPE'),
+    OPMODE_ENABLED_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_ENABLED'),
+    OPMODE_NAME_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_NAME'),
+    OPMODE_GROUP_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_GROUP'),
     MRC_CATEGORY_HARDWARE: t('BLOCKLY.CATEGORY.HARDWARE'),
     MRC_CATEGORY_ROBOT: t('BLOCKLY.CATEGORY.ROBOT'),
     MRC_CATEGORY_COMPONENTS: t('BLOCKLY.CATEGORY.COMPONENTS'),