Rename file
Add check on set number to ensure a '-X' is always present after a number.