Added option to disable automatic renaming