diff --git a/gui/trunk/CLASSRead.cxx b/gui/trunk/CLASSRead.cxx
index 550f911197d51da15d2df38704544288b1a1c042..3de1545e082e65b26bf0d83444fb95bcf68bad5c 100755
--- a/gui/trunk/CLASSRead.cxx
+++ b/gui/trunk/CLASSRead.cxx
@@ -1036,7 +1036,7 @@ void CLASSRead::ConvertxmlTTreeMass(vector<CLASSPlotElement> toplot, string file
 	else
 	{
 		f << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" << endl;
-		f << "<file filename = \"test.xml\" created=\" \""<<endl;
+		f << "<file filename = \""<< filename << "\" created=\" \""<<endl;
 		f << "<unit time=\"years\"  Masse=\"kg\" power=\"MW\" />"<<endl;
                 f << "<material matid=\" \">"<<endl;
 		f << "\t<time>" << endl;
@@ -1452,43 +1452,43 @@ string CLASSRead::GetTittleOutName(CLASSPlotElement toplot)
 			switch (toplot.fFacylityNumber)
 		{
 			case 0:
-				name = "PARC "+ itoa(toplot.fTreeId) + "TOTAL " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) + " TOTAL " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 				break;
 
 			case 1:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "INCYCLE " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " INCYCLE " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
 			case 2:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "WASTE " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " WASTE " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
 			case 3:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "GOD " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " GOD " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
 			case 4:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "REACTOR " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " REACTOR " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
 			case 5:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "COOLING " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " COOLING " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
 			case 6:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "STOCK " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " STOCK " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
 			case 7:
-				name = "PARC "+ itoa(toplot.fTreeId) +  "FUELFABRICATION " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+				name = "PARC "+ itoa(toplot.fTreeId) +  " FUELFABRICATION " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 				return name;
 				break;
 
@@ -1498,23 +1498,23 @@ string CLASSRead::GetTittleOutName(CLASSPlotElement toplot)
 			break;
 
 		case 1:
-			name = "PARC "+ itoa(toplot.fTreeId) +  "Reactor " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+			name = "PARC "+ itoa(toplot.fTreeId) +  " Reactor " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 			return name;
 			break;
 
 		case 2:
-			name = "PARC "+ itoa(toplot.fTreeId) +  "Storage " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+			name = "PARC "+ itoa(toplot.fTreeId) +  " Storage " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 			return name;
 			break;
 
 		case 3:
-			name = "PARC "+ itoa(toplot.fTreeId) +  "Cooling " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+			name = "PARC "+ itoa(toplot.fTreeId) +  " Cooling " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 			return name;
 
 			break;
 
 		case 4:
-			name = "PARC "+ itoa(toplot.fTreeId) +  "Fabrication " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
+			name = "PARC "+ itoa(toplot.fTreeId) +  " Fabrication " + itoa(toplot.fFacylityNumber) + " " + itoa(toplot.fZAI.Z()) + " " + itoa(toplot.fZAI.A()) + " " + itoa(toplot.fZAI.I());
 			return name;
 			break;
 			
diff --git a/gui/trunk/CLASSRead.hxx b/gui/trunk/CLASSRead.hxx
index ef7e789941c2cc8d97f2a3c285d88dc987c2551c..73251e1ed0cfbf7f887a16c2e5b425a600c6afe5 100755
--- a/gui/trunk/CLASSRead.hxx
+++ b/gui/trunk/CLASSRead.hxx
@@ -61,9 +61,9 @@ public :
 	void PlotTTreePower(vector<CLASSPlotElement> toplot, string opt = "L");
 
 	void ConvertxmlTTreeMass(vector<CLASSPlotElement> toplot, string filename);
-	void ConvertXmlMass(vector<CLASSPlotElement> toplot, string opt = "L");           
-	void ConvertxmlTTreePower(vector<CLASSPlotElement> toplotPower, string opt = "L");
-	void ConvertXmlPower(vector<CLASSPlotElement> toplotPower, string opt = "L");     
+	void ConvertXmlMass(vector<CLASSPlotElement> toplot, string opt);           
+	void ConvertxmlTTreePower(vector<CLASSPlotElement> toplotPower, string opt);
+	void ConvertXmlPower(vector<CLASSPlotElement> toplotPower, string opt );
 
 	void Write(string filename, string fileformat="ASCII");
 	void ASCIIWrite(string filename = "ASCII");
diff --git a/gui/trunk/CLASSWin.cxx b/gui/trunk/CLASSWin.cxx
index 5fa1bdffc649f8ffc7b5ea667f32f33fb7525802..53c97607346ca81606f64c97740837120a095f41 100755
--- a/gui/trunk/CLASSWin.cxx
+++ b/gui/trunk/CLASSWin.cxx
@@ -515,7 +515,7 @@ void MainWin::Conversionxml()
 	}
 
 	if(toplot.size() != 0)
-		fDATA->ConvertXmlMass(toplot);
+		fDATA->ConvertXmlMass(toplot, fSaveFileName);
 	
 }
 
@@ -999,7 +999,7 @@ void SubWin::SaveAs()
  fSH1->AddFrame(TEName, fL0);
  TEName->Associate(this);
 
- fRadioASCIISave=new TGRadioButton(fSH1,"ASCII ou APIED (hihi)",M_RADIO_ASCII_SAVE);	
+ fRadioASCIISave=new TGRadioButton(fSH1,"ASCII",M_RADIO_ASCII_SAVE);	
  fRadioXMLSave=new TGRadioButton(fSH1,"XML",M_RADIO_XML_SAVE);
  fRadioASCIISave->SetState(kButtonDown);
  fRadioASCIISave->Associate(this);