Renaming to avoid needing to disambiguate prelude functions
Adding EC2 overrides for required fields
Rendering newly named acceptor match functions
Regenerating
Adding additional EC2 overrides