Make clippy happy without renaming

This is just an alternate version of !7 (closed) without renaming enum variants.

The check script from !6 (merged) will ignore the naming warnings.