Fix Batch rename to batch problem