Added batch renaming support