diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e987a2..9145f0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `MarshalJSON` and `UnmarshalJSON` method to `atomic.Pointer[T]` type
 allowing users to use pointer with json.
 
+### Changed
+- Change a comment that marks generated Go code. Now it matches the regexp
+`^// Code generated .* DO NOT EDIT\.$` according to common Go standard.
+
 ## [1.11.0] - 2023-05-02
 ### Fixed
 - Fix `Swap` and `CompareAndSwap` for `Value` wrappers without initialization.
diff --git a/bool.go b/bool.go
index f0a2ddd..df29d22 100644
--- a/bool.go
+++ b/bool.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/duration.go b/duration.go
index 7c23868..e051bb5 100644
--- a/duration.go
+++ b/duration.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/error.go b/error.go
index b7e3f12..9c62c4f 100644
--- a/error.go
+++ b/error.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/float32.go b/float32.go
index 62c3633..8bc488d 100644
--- a/float32.go
+++ b/float32.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/float64.go b/float64.go
index 5bc11ca..ae1541c 100644
--- a/float64.go
+++ b/float64.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/int32.go b/int32.go
index 5320eac..0c3271d 100644
--- a/int32.go
+++ b/int32.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicint.
+// Code generated by gen-atomicint. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/int64.go b/int64.go
index 460821d..51600c6 100644
--- a/int64.go
+++ b/int64.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicint.
+// Code generated by gen-atomicint. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/internal/gen-atomicint/main.go b/internal/gen-atomicint/main.go
index 719fe9c..0d39e5e 100644
--- a/internal/gen-atomicint/main.go
+++ b/internal/gen-atomicint/main.go
@@ -103,7 +103,7 @@ func run(args []string) error {
 		return fmt.Errorf("reformat source: %v", err)
 	}
 
-	io.WriteString(w, "// @generated Code generated by gen-atomicint.\n\n")
+	io.WriteString(w, "// Code generated by gen-atomicint. DO NOT EDIT.\n\n")
 	_, err = w.Write(bs)
 	return err
 }
diff --git a/internal/gen-atomicwrapper/main.go b/internal/gen-atomicwrapper/main.go
index 982254d..56268ef 100644
--- a/internal/gen-atomicwrapper/main.go
+++ b/internal/gen-atomicwrapper/main.go
@@ -190,7 +190,7 @@ func run(args []string) error {
 		return fmt.Errorf("reformat source: %v", err)
 	}
 
-	io.WriteString(w, "// @generated Code generated by gen-atomicwrapper.\n\n")
+	io.WriteString(w, "// Code generated by gen-atomicwrapper. DO NOT EDIT.\n\n")
 	_, err = w.Write(bs)
 	return err
 }
diff --git a/string.go b/string.go
index 061466c..a7f571c 100644
--- a/string.go
+++ b/string.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/time.go b/time.go
index cc2a230..c02dc2a 100644
--- a/time.go
+++ b/time.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicwrapper.
+// Code generated by gen-atomicwrapper. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/uint32.go b/uint32.go
index 4adc294..0145e5c 100644
--- a/uint32.go
+++ b/uint32.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicint.
+// Code generated by gen-atomicint. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/uint64.go b/uint64.go
index 0e2eddb..3c1f4f2 100644
--- a/uint64.go
+++ b/uint64.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicint.
+// Code generated by gen-atomicint. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/uintptr.go b/uintptr.go
index 7d5b000..4b34841 100644
--- a/uintptr.go
+++ b/uintptr.go
@@ -1,6 +1,6 @@
-// @generated Code generated by gen-atomicint.
+// Code generated by gen-atomicint. DO NOT EDIT.
 
-// Copyright (c) 2020-2023 Uber Technologies, Inc.
+// Copyright (c) 2020-2024 Uber Technologies, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal