Edit for script renames, include consolidation