diff --git a/lib/racc/parser-text.rb b/lib/racc/parser-text.rb
index 63ef3235c9..7adc21ee7a 100644
--- a/lib/racc/parser-text.rb
+++ b/lib/racc/parser-text.rb
@@ -60,7 +60,7 @@ end
 # [-E, --embedded]
 #   Output parser which doesn't need runtime files (racc/parser.rb).
 # [-C, --check-only]
-#   Check syntax of racc grammer file and quit.
+#   Check syntax of racc grammar file and quit.
 # [-S, --output-status]
 #   Print messages time to time while compiling.
 # [-l, --no-line-convert]
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index 41740ade39..a2bc47b425 100644
--- a/lib/racc/parser.rb
+++ b/lib/racc/parser.rb
@@ -58,7 +58,7 @@ end
 # [-E, --embedded]
 #   Output parser which doesn't need runtime files (racc/parser.rb).
 # [-C, --check-only]
-#   Check syntax of racc grammer file and quit.
+#   Check syntax of racc grammar file and quit.
 # [-S, --output-status]
 #   Print messages time to time while compiling.
 # [-l, --no-line-convert]
diff --git a/lib/racc/parserfilegenerator.rb b/lib/racc/parserfilegenerator.rb
index b4fac62ce5..fdce45cbbf 100644
--- a/lib/racc/parserfilegenerator.rb
+++ b/lib/racc/parserfilegenerator.rb
@@ -123,7 +123,7 @@ module Racc
       line %q[#]
       line %q[# DO NOT MODIFY!!!!]
       line %Q[# This file is automatically generated by Racc #{Racc::Version}]
-      line %Q[# from Racc grammer file "#{@params.filename}".]
+      line %Q[# from Racc grammar file "#{@params.filename}".]
       line %q[#]
     end
 
diff --git a/test/racc/regress/cadenza b/test/racc/regress/cadenza
index b0d61e8904..dddbfd8135 100644
--- a/test/racc/regress/cadenza
+++ b/test/racc/regress/cadenza
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/cast b/test/racc/regress/cast
index dba604366a..43a0e161ec 100644
--- a/test/racc/regress/cast
+++ b/test/racc/regress/cast
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/csspool b/test/racc/regress/csspool
index 79aaa63af0..ff35545fbe 100644
--- a/test/racc/regress/csspool
+++ b/test/racc/regress/csspool
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/edtf b/test/racc/regress/edtf
index 86facf23b0..7128197673 100644
--- a/test/racc/regress/edtf
+++ b/test/racc/regress/edtf
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/huia b/test/racc/regress/huia
index 4dc35fad77..99a92be6cd 100644
--- a/test/racc/regress/huia
+++ b/test/racc/regress/huia
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/journey b/test/racc/regress/journey
index 3245106507..c8cac291aa 100644
--- a/test/racc/regress/journey
+++ b/test/racc/regress/journey
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/liquor b/test/racc/regress/liquor
index 920b9aa704..e40f0fc7a2 100644
--- a/test/racc/regress/liquor
+++ b/test/racc/regress/liquor
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/machete b/test/racc/regress/machete
index e42c8e4f4f..bbd4764bd9 100644
--- a/test/racc/regress/machete
+++ b/test/racc/regress/machete
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/mediacloth b/test/racc/regress/mediacloth
index e2d0a70363..e98e844a23 100644
--- a/test/racc/regress/mediacloth
+++ b/test/racc/regress/mediacloth
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/mof b/test/racc/regress/mof
index ff3c4639df..6cade72d83 100644
--- a/test/racc/regress/mof
+++ b/test/racc/regress/mof
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/namae b/test/racc/regress/namae
index 856adc78e5..27fdc899aa 100644
--- a/test/racc/regress/namae
+++ b/test/racc/regress/namae
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/nasl b/test/racc/regress/nasl
index e1b82dc128..650116f382 100644
--- a/test/racc/regress/nasl
+++ b/test/racc/regress/nasl
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/nokogiri-css b/test/racc/regress/nokogiri-css
index f10e24fb62..9552939f9d 100644
--- a/test/racc/regress/nokogiri-css
+++ b/test/racc/regress/nokogiri-css
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/opal b/test/racc/regress/opal
index cfe2d4d81a..5d8ff4a1f8 100644
--- a/test/racc/regress/opal
+++ b/test/racc/regress/opal
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/php_serialization b/test/racc/regress/php_serialization
index 3146d548e0..d79b8e31b6 100644
--- a/test/racc/regress/php_serialization
+++ b/test/racc/regress/php_serialization
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/riml b/test/racc/regress/riml
index 7a455eaeaf..6cb9b2c878 100644
--- a/test/racc/regress/riml
+++ b/test/racc/regress/riml
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/ruby18 b/test/racc/regress/ruby18
index 6858c1c042..763e2bd164 100644
--- a/test/racc/regress/ruby18
+++ b/test/racc/regress/ruby18
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/ruby22 b/test/racc/regress/ruby22
index ef75d14392..16a4fea77c 100644
--- a/test/racc/regress/ruby22
+++ b/test/racc/regress/ruby22
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/tp_plus b/test/racc/regress/tp_plus
index 2ca318ba71..e88335cbc6 100644
--- a/test/racc/regress/tp_plus
+++ b/test/racc/regress/tp_plus
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
diff --git a/test/racc/regress/twowaysql b/test/racc/regress/twowaysql
index 173a8552db..6e7b22c0a6 100644
--- a/test/racc/regress/twowaysql
+++ b/test/racc/regress/twowaysql
@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.16.pre.1
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'