From c89adcc9898b879d6cbce78085b0b1e3634e9aa3 Mon Sep 17 00:00:00 2001
From: David Gregory <2992938+DavidGregory084@users.noreply.github.com>
Date: Tue, 4 Jul 2023 15:59:15 +0100
Subject: [PATCH] More consistent naming in action templates error messages

---
 tool/src/org/antlr/v4/tool/ErrorType.java                | 4 ++--
 tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tool/src/org/antlr/v4/tool/ErrorType.java b/tool/src/org/antlr/v4/tool/ErrorType.java
index 78323d675e5..20a569cd55d 100644
--- a/tool/src/org/antlr/v4/tool/ErrorType.java
+++ b/tool/src/org/antlr/v4/tool/ErrorType.java
@@ -1238,9 +1238,9 @@ public enum ErrorType {
 	/**
 	 * Compiler Error 206.
 	 *
-	 * <p>cannot find actions template file <em>filename</em></p>
+	 * <p>cannot find action templates file <em>filename</em></p>
 	 */
-	CANNOT_FIND_ACTIONS_TEMPLATE_FILE_GIVEN_ON_CMDLINE(206, "cannot find action templates file <arg> given for <arg2>", ErrorSeverity.ERROR),
+	CANNOT_FIND_ACTION_TEMPLATES_FILE_GIVEN_ON_CMDLINE(206, "cannot find action templates file <arg> given for <arg2>", ErrorSeverity.ERROR),
 	/**
 	 * Compiler Error 207.
 	 *
diff --git a/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java b/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
index 1eab9ac440e..2dbb84d9011 100644
--- a/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
+++ b/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
@@ -537,7 +537,7 @@ public Object post(Object t) {
 			});
 		} catch (IllegalArgumentException e) {
 			if (e.getMessage() != null && e.getMessage().startsWith("No such group file")) {
-				tool.errMgr.toolError(ErrorType.CANNOT_FIND_ACTIONS_TEMPLATE_FILE_GIVEN_ON_CMDLINE, e, fileName, root.g.name);
+				tool.errMgr.toolError(ErrorType.CANNOT_FIND_ACTION_TEMPLATES_FILE_GIVEN_ON_CMDLINE, e, fileName, root.g.name);
 			} else {
 				tool.errMgr.toolError(ErrorType.ERROR_READING_ACTION_TEMPLATES_FILE, e, fileName, e.getMessage());
 			}