Changing getFileWithIncrementedName to not increment if the file doesn't exist.
Changing format of file name with counter.