rename FileChooserDialogNew[12] -> FileChooserDialogNewWith[12]Button(s?)