diff --git a/beacon/engine/codec_bapl.go b/beacon/engine/bapl_encode.go
similarity index 100%
rename from beacon/engine/codec_bapl.go
rename to beacon/engine/bapl_encode.go
diff --git a/beacon/engine/gen_ed.go b/beacon/engine/ed_codec.go
similarity index 100%
rename from beacon/engine/gen_ed.go
rename to beacon/engine/ed_codec.go
diff --git a/beacon/engine/gen_epe.go b/beacon/engine/epe_decode.go
similarity index 100%
rename from beacon/engine/gen_epe.go
rename to beacon/engine/epe_decode.go
diff --git a/beacon/engine/codec_epe.go b/beacon/engine/epe_encode.go
similarity index 100%
rename from beacon/engine/codec_epe.go
rename to beacon/engine/epe_encode.go
diff --git a/beacon/engine/codec_epe_test.go b/beacon/engine/epe_test.go
similarity index 100%
rename from beacon/engine/codec_epe_test.go
rename to beacon/engine/epe_test.go
diff --git a/beacon/engine/gen_blockparams.go b/beacon/engine/pa_codec.go
similarity index 100%
rename from beacon/engine/gen_blockparams.go
rename to beacon/engine/pa_codec.go
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index 7cc49c637e..60d564b877 100644
--- a/beacon/engine/types.go
+++ b/beacon/engine/types.go
@@ -60,7 +60,7 @@ var (
 	PayloadV4 PayloadVersion = 0x4
 )
 
-//go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go
+//go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out pa_codec.go
 
 // PayloadAttributes describes the environment context in which a block should
 // be built.
@@ -79,7 +79,7 @@ type payloadAttributesMarshaling struct {
 	SlotNumber *hexutil.Uint64
 }
 
-//go:generate go run github.com/fjl/gencodec -type ExecutableData -field-override executableDataMarshaling -out gen_ed.go
+//go:generate go run github.com/fjl/gencodec -type ExecutableData -field-override executableDataMarshaling -out ed_codec.go
 
 // ExecutableData is the data necessary to execute an EL payload.
 type ExecutableData struct {
@@ -127,7 +127,7 @@ type StatelessPayloadStatusV1 struct {
 	ValidationError *string     `json:"validationError"`
 }
 
-//go:generate go run github.com/fjl/gencodec -enc=false -type ExecutionPayloadEnvelope -field-override executionPayloadEnvelopeMarshaling -out gen_epe.go
+//go:generate go run github.com/fjl/gencodec -enc=false -type ExecutionPayloadEnvelope -field-override executionPayloadEnvelopeMarshaling -out epe_decode.go
 
 type ExecutionPayloadEnvelope struct {
 	ExecutionPayload *ExecutableData `json:"executionPayload"  gencodec:"required"`