added auto-rename
switched