Added support for renaming with _1 _2 for duplicate files and changed word seperator to space from underscore