Rename script for pass-resolving prep work; also lots of edits