Upgrade find-and-replace to clean up specs