Couple more tweaks with the rename script to fix issues renaming directories.