diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 4f20719bf..48b643da6 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -782,7 +782,7 @@ class GoGenerator : public BaseGenerator {
   void BeginFile(const std::string name_space_name, const bool needs_imports,
                  std::string *code_ptr) {
     std::string &code = *code_ptr;
-    code = code + "// " + FlatBuffersGeneratedWarning() + "\n\n";
+    code = code + "// Code generated by the FlatBuffers compiler. DO NOT EDIT.\n\n";
     code += "package " + name_space_name + "\n\n";
     if (needs_imports) {
       code += "import (\n";
diff --git a/tests/MyGame/Example/Ability.go b/tests/MyGame/Example/Ability.go
index 2ea866538..a56b44521 100644
--- a/tests/MyGame/Example/Ability.go
+++ b/tests/MyGame/Example/Ability.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Any.go b/tests/MyGame/Example/Any.go
index 06c238ef8..39b89a79a 100644
--- a/tests/MyGame/Example/Any.go
+++ b/tests/MyGame/Example/Any.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Color.go b/tests/MyGame/Example/Color.go
index 7318cbc13..cc0833488 100644
--- a/tests/MyGame/Example/Color.go
+++ b/tests/MyGame/Example/Color.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
index 4cab6b8fb..35514288f 100644
--- a/tests/MyGame/Example/Monster.go
+++ b/tests/MyGame/Example/Monster.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Referrable.go b/tests/MyGame/Example/Referrable.go
index 1fae1869a..0fb06fb20 100644
--- a/tests/MyGame/Example/Referrable.go
+++ b/tests/MyGame/Example/Referrable.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Stat.go b/tests/MyGame/Example/Stat.go
index 9abc558a4..401712fbf 100644
--- a/tests/MyGame/Example/Stat.go
+++ b/tests/MyGame/Example/Stat.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Test.go b/tests/MyGame/Example/Test.go
index cb283fbdf..53f53fd41 100644
--- a/tests/MyGame/Example/Test.go
+++ b/tests/MyGame/Example/Test.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.go b/tests/MyGame/Example/TestSimpleTableWithEnum.go
index 0704b70ef..559cd1f41 100644
--- a/tests/MyGame/Example/TestSimpleTableWithEnum.go
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/TypeAliases.go b/tests/MyGame/Example/TypeAliases.go
index c64c2879f..f3d6b8451 100644
--- a/tests/MyGame/Example/TypeAliases.go
+++ b/tests/MyGame/Example/TypeAliases.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example/Vec3.go b/tests/MyGame/Example/Vec3.go
index a880a4077..f18fc27b7 100644
--- a/tests/MyGame/Example/Vec3.go
+++ b/tests/MyGame/Example/Vec3.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example
 
diff --git a/tests/MyGame/Example2/Monster.go b/tests/MyGame/Example2/Monster.go
index 79949b901..d0fae94d9 100644
--- a/tests/MyGame/Example2/Monster.go
+++ b/tests/MyGame/Example2/Monster.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package Example2
 
diff --git a/tests/MyGame/InParentNamespace.go b/tests/MyGame/InParentNamespace.go
index 341b05c02..fc6ce3263 100644
--- a/tests/MyGame/InParentNamespace.go
+++ b/tests/MyGame/InParentNamespace.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package MyGame
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
index a7f236577..797ea67f0 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/EnumInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
index 00840aa31..e985fbf77 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
index 0e767b84e..75f7a5548 100644
--- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
+++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package NamespaceB
 
diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.go b/tests/namespace_test/NamespaceA/SecondTableInA.go
index bd691e81f..3fea3a82a 100644
--- a/tests/namespace_test/NamespaceA/SecondTableInA.go
+++ b/tests/namespace_test/NamespaceA/SecondTableInA.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.go b/tests/namespace_test/NamespaceA/TableInFirstNS.go
index b3354d305..82f57c30c 100644
--- a/tests/namespace_test/NamespaceA/TableInFirstNS.go
+++ b/tests/namespace_test/NamespaceA/TableInFirstNS.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package NamespaceA
 
diff --git a/tests/namespace_test/NamespaceC/TableInC.go b/tests/namespace_test/NamespaceC/TableInC.go
index 7e6c73383..5cd30da83 100644
--- a/tests/namespace_test/NamespaceC/TableInC.go
+++ b/tests/namespace_test/NamespaceC/TableInC.go
@@ -1,4 +1,4 @@
-// automatically generated by the FlatBuffers compiler, do not modify
+// Code generated by the FlatBuffers compiler. DO NOT EDIT.
 
 package NamespaceC