minor fixes to make default flavours, update naming in some dialogs