Cleanup Require/Before logic, fix template to use new names.