1 files changed, 8 insertions, 1 deletions
diff --git a/name.sh b/name.sh
index a8e709c..9da92fc 100755
--- a/name.sh
+++ b/name.sh
@@ -7,5 +7,12 @@ awk "
 	/KEY_MIN_INTERESTING/	{next};
 	/EV_VERSION/	{ next };
 	/_MAX/		{ next };
-	/#define $1_/	{ printf(\"\t[ %-16s ] = \\\"%s\\\",\n\", \$2, \$2); }
+	/_CNT/		{ next };
+	/#define $1_/	{ 
+		name = \$2;
+                if (\"$TYPE\" != \"BTN\") {
+			sub(\"^${TYPE}_\", \"\", name);
+		}
+		printf(\"\t[ %-16s ] = \\\"%s\\\",\n\", \$2, name);
+	}
 " < $INPUT