Rename post-process utility
Simplify headers