Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromWTC.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromWTC.java	(revision 802)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromWTC.java	(revision 803)
@@ -71,21 +71,21 @@
 	/**
 	 * process !!!.
 	 *
-	 * @param wtcfile the xmlfile
+	 * @param cqpfile the xmlfile
 	 * @param wordstag the wordstag
 	 * @return true if successful
 	 * @throws XMLStreamException the xML stream exception
 	 * @throws FactoryConfigurationError the factory configuration error
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
-	public boolean process(File wtcfile)
+	public boolean process(File cqpfile)
 			throws XMLStreamException, FactoryConfigurationError, IOException {
-		if (wtcfile == null || !wtcfile.exists()) {
-			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.BuildCwbEncodeArgs_0, wtcfile));
+		if (cqpfile == null || !cqpfile.exists()) {
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.BuildCwbEncodeArgs_0, cqpfile));
 			return false;
 		}
 
-		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(wtcfile), "UTF-8"));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(cqpfile), "UTF-8"));
 
 		String line = reader.readLine();
 		String localname;
@@ -199,7 +199,7 @@
 		try {
 			BuildCwbEncodeArgsFromWTC argsgetter = new BuildCwbEncodeArgsFromWTC();
 			argsgetter.process(new File(
-					"/home/mdecorde/xml/wtc/discours.wtc")); //$NON-NLS-1$
+					"/home/mdecorde/xml/cqp/discours.cqp")); //$NON-NLS-1$
 
 			System.out.println("pAttributes : " + argsgetter.getPAttributes()); //$NON-NLS-1$
 			System.out.println("sAttributes : " + argsgetter.getSAttributes()); //$NON-NLS-1$
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java	(revision 802)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java	(revision 803)
@@ -340,19 +340,19 @@
 	/**
 	 * concatenates WTC files into one master WTC file and wraps with the 'txmcorpus' structure. 
 	 * 
-	 * @param wtcFiles
-	 * @param allwtcFile
+	 * @param cqpFiles
+	 * @param allcqpFile
 	 * @return true if the WTC files are concatenated
 	 * @throws IOException
 	 */
-	public static boolean concat(ArrayList<File> wtcFiles, File allwtcFile) throws IOException {
-		PrintWriter output = IOUtils.getWriter(allwtcFile);
-		ConsoleProgressBar cpb = new ConsoleProgressBar(wtcFiles.size());
+	public static boolean concat(ArrayList<File> cqpFiles, File allcqpFile) throws IOException {
+		PrintWriter output = IOUtils.getWriter(allcqpFile);
+		ConsoleProgressBar cpb = new ConsoleProgressBar(cqpFiles.size());
 
 		output.write("<txmcorpus lang=\"fr\">\n");
-		for (File wtcFile : wtcFiles) {
+		for (File cqpFile : cqpFiles) {
 			cpb.tick();
-			output.write(IOUtils.getText(wtcFile, "UTF-8"));
+			output.write(IOUtils.getText(cqpFile, "UTF-8"));
 			output.write("\n");
 			output.flush();
 		}
@@ -374,12 +374,12 @@
 		 * String[] pAttributes = {"pos", "id", "col"}; String[] sAttributes =
 		 * {"p:0+n", "s:0+n"}; try {//cwbEn.run(
 		 * "/home/ayepdieu/textometrie/trunk/toolbox/src/main/C/cwb-3.0/utils/cwb-encode"
-		 * , "/home/txm/form/data/qgraalcm", "/home/txm/form/wtc/qgraalcm.wtc",
+		 * , "/home/txm/form/data/qgraalcm", "/home/txm/form/cqp/qgraalcm.cqp",
 		 * "/home/txm/form/registry/qgraalcm",pAttributes, sAttributes);
 		 * cwbEn.run(
 		 * "/home/ayepdieu/textometrie/trunk/toolbox/src/main/C/cwb-3.0/utils/cwb-encode"
 		 * , "/home/txm/form/data/qgraalfrmod",
-		 * "/home/txm/form/wtc/qgraalfrmod.wtc",
+		 * "/home/txm/form/cqp/qgraalfrmod.cqp",
 		 * "/home/txm/form/registry/qgraalfrmod", pAttributes, sAttributes);
 		 * System.out.println(cwbEn.getErrorStream().toString()); } catch
 		 * (Exception ex) { System.out.println(ex);
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildAlignOut.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildAlignOut.java	(revision 802)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildAlignOut.java	(revision 803)
@@ -15,21 +15,21 @@
  */
 public class BuildAlignOut {
 	
-	File wtcFile1;
-	File wtcFile2;
+	File cqpFile1;
+	File cqpFile2;
 	
-	public BuildAlignOut(File wtcFile1, File wtcFile2) {
-		this.wtcFile1 = wtcFile1;
-		this.wtcFile2 = wtcFile2;
+	public BuildAlignOut(File cqpFile1, File cqpFile2) {
+		this.cqpFile1 = cqpFile1;
+		this.cqpFile2 = cqpFile2;
 	}
 	
 	public boolean process(File alignOutFile, String su, String sup) throws IOException {
 		
-		ArrayList<Integer> positions1 = getWordPositions(wtcFile1, su, sup);
-		ArrayList<Integer> positions2 = getWordPositions(wtcFile2, su, sup);
+		ArrayList<Integer> positions1 = getWordPositions(cqpFile1, su, sup);
+		ArrayList<Integer> positions2 = getWordPositions(cqpFile2, su, sup);
 		
 		if (positions1.size() != positions2.size()) {
-			System.out.println("Error: the number of segment differs. "+positions1.size()+" in "+wtcFile1+" and "+positions2.size()+" in "+wtcFile2);
+			System.out.println("Error: the number of segment differs. "+positions1.size()+" in "+cqpFile1+" and "+positions2.size()+" in "+cqpFile2);
 			return false;
 		}
 		
@@ -37,9 +37,9 @@
 		String encoding = "UTF-8";
 		PrintWriter writer = IOUtils.getWriter(alignOutFile, encoding);
 		
-		String c1 = wtcFile1.getName().toLowerCase();
+		String c1 = cqpFile1.getName().toLowerCase();
 		c1 = c1.substring(0, c1.length()-4);
-		String c2 = wtcFile2.getName().toLowerCase();
+		String c2 = cqpFile2.getName().toLowerCase();
 		c2 = c2.substring(0, c2.length()-4);
 		
 		writer.println(c1+"\t"+su+"\t"+c2+"\t"+su);
@@ -51,10 +51,10 @@
 		return true;
 	}
 
-	private static ArrayList<Integer> getWordPositions(File wtcFile, String su,
+	private static ArrayList<Integer> getWordPositions(File cqpFile, String su,
 			String sup) throws IOException {
 		
-		BufferedReader reader = IOUtils.getReader(wtcFile);
+		BufferedReader reader = IOUtils.getReader(cqpFile);
 		int position_counter = 0;
 		ArrayList<Integer> positions1 = new ArrayList<Integer>();
 		
@@ -85,11 +85,11 @@
 //		PatchCwbRegistry.patchAlignment(new File("/home/mdecorde/TEMP/align/registry", "c1"), "c2");
 //		PatchCwbRegistry.patchAlignment(new File("/home/mdecorde/TEMP/align/registry", "c2"), "c1");
 		
-		File wtcFile1 = new File("/home/mdecorde/TXM/corpora/SAMPLE/wtc/SAMPLE_en0.wtc");
-		File wtcFile2 = new File("/home/mdecorde/TXM/corpora/SAMPLE/wtc/SAMPLE_fr3.wtc");
+		File cqpFile1 = new File("/home/mdecorde/TXM/corpora/SAMPLE/cqp/SAMPLE_en0.cqp");
+		File cqpFile2 = new File("/home/mdecorde/TXM/corpora/SAMPLE/cqp/SAMPLE_fr3.cqp");
 		File alignOutFile = new File("/home/mdecorde/TXM/corpora/SAMPLE/align.out");
 		
-		BuildAlignOut bao = new BuildAlignOut(wtcFile1, wtcFile2);
+		BuildAlignOut bao = new BuildAlignOut(cqpFile1, cqpFile2);
 		System.out.println("Result: "+bao.process(alignOutFile, "seg", "id"));
 	}
 }
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/ReadRegistryFile.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/ReadRegistryFile.java	(revision 802)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/ReadRegistryFile.java	(revision 803)
@@ -62,7 +62,7 @@
 	}
 	
 	public static void main(String[] args) {
-		File registry = new File("/home/matt/xml/wtc/discours");
+		File registry = new File("/home/matt/xml/cqp/discours");
 		ReadRegistryFile reader = new ReadRegistryFile(registry);
 		System.out.println("pAttributes: "+reader.getPAttributes());
 		System.out.println("sAttributes Map: "+reader.getSAttributesMap());
Index: tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java	(revision 802)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java	(revision 803)
@@ -88,7 +88,7 @@
 	HashMap<String, Integer> structuresCounts = new HashMap<String, Integer>(); // structures counts
 
 	/** The internal architecture. */
-	List<String> internalArchitecture = new ArrayList<String>(); // wtc structures = propertiesCounts keys but ordered
+	List<String> internalArchitecture = new ArrayList<String>(); // cqp structures = propertiesCounts keys but ordered
 	
 	/** The hierarchie counts. */
 	HashMap<String, Integer> hierarchieCounts = new HashMap<String, Integer>(); // hierarchic structures counts
Index: tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/InstallGroovyFiles.java
===================================================================
--- tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/InstallGroovyFiles.java	(revision 802)
+++ tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/InstallGroovyFiles.java	(revision 803)
@@ -40,7 +40,7 @@
 		publishedImports.put(IMPORTERPACKAGE+"transcriber","transcriberLoader.groovy");
 		publishedImports.put(IMPORTERPACKAGE+"tmx","tmxLoader.groovy");
 		publishedImports.put(IMPORTERPACKAGE+"doc","docLoader.groovy");
-		publishedImports.put(IMPORTERPACKAGE+"wtc","wtcLoader.groovy");
+		publishedImports.put(IMPORTERPACKAGE+"cqp","cqpLoader.groovy");
 		
 		String bundle_id = "org.txm.groovy.core";
 		for (String p : publishedImports.keySet()) {
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/Compiler.java
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/Compiler.java	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/Compiler.java	(revision 803)
@@ -13,7 +13,7 @@
  */
 public class Compiler extends ImportStep {
 
-	protected File wtcDirectory, registryDirectory, dataDirectory;
+	protected File cqpDirectory, registryDirectory, dataDirectory;
 	protected ArrayList<File> files;
 	
 	/**
@@ -25,7 +25,7 @@
 		super(module);
 
 		inputDirectory = new File(module.getBinaryDirectory(), "txm/"+module.getCorpusName());
-		wtcDirectory = new File(module.getBinaryDirectory(), "wtc");		
+		cqpDirectory = new File(module.getBinaryDirectory(), "cqp");		
 		outputDirectory = new File(module.getBinaryDirectory(), "data");
 		registryDirectory = new File(module.getBinaryDirectory(), "registry");
 		dataDirectory = new File(outputDirectory, module.getCorpusName());
@@ -40,8 +40,8 @@
 		registryDirectory.mkdirs();
 		
 		if (!module.isUpdatingCorpus()) {
-			DeleteDir.deleteDirectory(wtcDirectory);
-			wtcDirectory.mkdir();
+			DeleteDir.deleteDirectory(cqpDirectory);
+			cqpDirectory.mkdir();
 		}
 	}
 
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZCompilerStep.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZCompilerStep.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZCompilerStep.groovy	(revision 803)
@@ -16,7 +16,7 @@
 	static String QUOTE = "\"";
 
 	File xmlFile
-	File wtcFile
+	File cqpFile
 	String textname, corpusname, projectname;
 	boolean normalizeAttributeValues = false;
 	boolean normalizeAnaValues = true;
@@ -44,9 +44,9 @@
 		this.normalizeFormValues = n;
 	}
 
-	public XTZCompilerStep(File xmlFile, File wtcFile, String textname, String corpusname, String projectname, def anatypes, def wtag) {
+	public XTZCompilerStep(File xmlFile, File cqpFile, String textname, String corpusname, String projectname, def anatypes, def wtag) {
 		this.xmlFile = xmlFile;
-		this.wtcFile = wtcFile;
+		this.cqpFile = cqpFile;
 		this.textname = textname
 		this.corpusname = corpusname;
 		this.projectname = projectname;
@@ -81,7 +81,7 @@
 	}
 
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -89,7 +89,7 @@
 	 */
 	public boolean process()
 	{
-		if (!createOutput(wtcFile))
+		if (!createOutput(cqpFile))
 			return false;
 
 		String headvalue=""
@@ -253,7 +253,7 @@
 			System.out.println("Exception while parsing " + inputData+" of Text "+textname+" : "+ex);
 			File errorDir = null
 			try {
-				errorDir = new File(wtcFile.getParentFile(), "compiler-error")
+				errorDir = new File(cqpFile.getParentFile(), "compiler-error")
 				println "Warning: Moving $xmlFile to $errorDir"
 				errorDir.mkdir();
 				FileCopy.copy(xmlFile, new File(errorDir, xmlFile.getName()))
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZCompiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZCompiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xtz/XTZCompiler.groovy	(revision 803)
@@ -47,7 +47,7 @@
 		
 		String cleanDirectories = module.getParameters().getKeyValueParameters().get(ImportKeys.CLEAN);
 		if ("true".equals(cleanDirectories)) {
-			new File(module.getBinaryDirectory(), "wtc").deleteDir()
+			new File(module.getBinaryDirectory(), "cqp").deleteDir()
 		}
 		
 		isSuccessFul = true;
@@ -107,10 +107,10 @@
 //				anatypes << type
 	}
 
-	def wtcFiles = []
+	def cqpFiles = []
 	public boolean doWTCStep() {
 		println "-- Building WTC files $inputDirectory..."
-		wtcDirectory.mkdir(); // if not created
+		cqpDirectory.mkdir(); // if not created
 		
 		ConsoleProgressBar cpb = new ConsoleProgressBar(files.size())
 		for (File xmlFile : files) {
@@ -119,12 +119,12 @@
 			int idx = textname.lastIndexOf(".")
 			if (idx > 0) textname = textname.substring(0, idx)
 			
-			File wtcFile = new File(wtcDirectory, textname + ".wtc")
-			wtcFiles << wtcFile
-			// skip step if wtcFile is more recent than xmlFile
-			if (wtcFile.exists() && wtcFile.lastModified() >= xmlFile.lastModified()) continue;
+			File cqpFile = new File(cqpDirectory, textname + ".cqp")
+			cqpFiles << cqpFile
+			// skip step if cqpFile is more recent than xmlFile
+			if (cqpFile.exists() && cqpFile.lastModified() >= xmlFile.lastModified()) continue;
 			
-			XTZCompilerStep step = new XTZCompilerStep(xmlFile, wtcFile, textname, corpusname, "default", anatypes, wtag)
+			XTZCompilerStep step = new XTZCompilerStep(xmlFile, cqpFile, textname, corpusname, "default", anatypes, wtag)
 			step.setNormalizeAnaValues(doNormalizeAnaValues)
 			step.setNormalizeAttributeValues(doNormalizeAttributeValues)
 			if (!step.process()) {
@@ -198,22 +198,22 @@
 		String[] pAttributes = pAttrs
 		println " Word properties: "+pAttributes
 		println " Structures: "+sargs
-		File allwtcFile = new File(wtcDirectory, "all.wtc");
+		File allcqpFile = new File(cqpDirectory, "all.cqp");
 		try {		
-			if (!CwbEncode.concat(wtcFiles, allwtcFile)) {
-				println "Fail to write the master wtc file: "+allwtcFile
+			if (!CwbEncode.concat(cqpFiles, allcqpFile)) {
+				println "Fail to write the master cqp file: "+allcqpFile
 				return false;
 			}
 						
 			cwbEn.run(outputDirectory.getAbsolutePath() + "/$corpusname",
-					allwtcFile.getAbsolutePath(),
+					allcqpFile.getAbsolutePath(),
 					regPath, pAttributes, sAttributes, false);
 				
-			allwtcFile.delete(); // clean
+			allcqpFile.delete(); // clean
 		} catch (Exception e) {
 			println "Error while running cwb-encode: "+e
 			e.printStackTrace()
-			allwtcFile.delete(); // clean 
+			allcqpFile.delete(); // clean 
 			return false;
 		}
 		println ""
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/GraalImportCqp.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/GraalImportCqp.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/GraalImportCqp.groovy	(revision 803)
@@ -37,7 +37,7 @@
  * The Class GraalImportCqp.
  *
  * @author ayepdieu
- * parse graal xml file to build the wtc the next step is to call importInCWB script
+ * parse graal xml file to build the cqp the next step is to call importInCWB script
  */
 public class GraalImportCqp{
 	
@@ -383,7 +383,7 @@
 
 		if (args.length == 0) {
 			GraalImportCqp traitTxt = new GraalImportCqp(new URL("file://"+ inDir + "/" + inFile));
-			traitTxt.transfomFileWtc("/home/ayepdieu/srcQuete/result", "graal.wtc");
+			traitTxt.transfomFileWtc("/home/ayepdieu/srcQuete/result", "graal.cqp");
 		}else if(args.length == 3){
 			GraalImportCqp traitTxt = new GraalImportCqp(new URL(args[0]));
 			traitTxt.transfomFileWtc(args[1], args[2]);
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/ImportInCWB.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/ImportInCWB.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/ImportInCWB.groovy	(revision 803)
@@ -39,7 +39,7 @@
  *
  * @author sheiden,mdecorde
  * 
- * import graal wtc fiel into cwb
+ * import graal cqp fiel into cwb
  */
 public class ImportInCWB{
 
@@ -49,7 +49,7 @@
 	/** The in dir. */
 	def inDir;
 	 	
-	//dossier qui contiendra les gsp et vues dipl, cour, facs, trad et wtc
+	//dossier qui contiendra les gsp et vues dipl, cour, facs, trad et cqp
 	
 	/** The out dir. */
 	def outDir;
@@ -103,7 +103,7 @@
 	private void createDirs()
 	{
 		new File(outDir).mkdir();
-		new File(outDir+"/wtc").mkdir();
+		new File(outDir+"/cqp").mkdir();
 		new File(outDirTxm).mkdir();
 		new File(outDirTxm+"registry").mkdir();
 		new File(outDirTxm+"data").mkdir();
@@ -116,16 +116,16 @@
 	 * cwb-makeall.
 	 */
 	public void start()
-	{//transfome en wtc et compile les index
+	{//transfome en cqp et compile les index
 		System.out.println "file:///"+ inDir + "/" + inFile+ ".xml";
 		CwbEncode cwbEn = new CwbEncode();
 		CwbMakeAll cwbMa = new CwbMakeAll();
 		
 		GraalImportCqp traitTxt = new GraalImportCqp(new URL("file:///"+ inDir + "/" + inFile+ ".xml"));
-		traitTxt.transfomFileWtc(outDir+"/wtc/", outFile + ".wtc");
+		traitTxt.transfomFileWtc(outDir+"/cqp/", outFile + ".cqp");
 		
 		traitTxt = new GraalImportCqp(new URL("file:///"+ inDir + "/" + inFile2+ ".xml"));
-		traitTxt.transfomFileWtcBrut(outDir+"/wtc/", outFile2 + ".wtc");
+		traitTxt.transfomFileWtcBrut(outDir+"/cqp/", outFile2 + ".cqp");
 		
 		System.out.println("--Building index files ...") 
 		String[] pAttributecm = ["pos", "q", "supplied", "col", "line", "id", "dipl", "facs"];
@@ -136,18 +136,18 @@
 		try {
 			if (System.getProperty("os.name").contains("Windows"))
 			{
-				cwbEn.run(outDirTxm + "data/"+outFile, outDir +"/wtc/"+outFile+".wtc", outDirTxm + "registry/"+outFile,pAttributecm, sAttributecm);
+				cwbEn.run(outDirTxm + "data/"+outFile, outDir +"/cqp/"+outFile+".cqp", outDirTxm + "registry/"+outFile,pAttributecm, sAttributecm);
 				cwbMa.run(outFile.toUpperCase(), outDirTxm + "registry");
 				
-				cwbEn.run(outDirTxm + "data/"+outFile2, outDir + "/wtc/"+outFile2+".wtc", outDirTxm + "registry/"+outFile2, pAttributes, sAttributes);
+				cwbEn.run(outDirTxm + "data/"+outFile2, outDir + "/cqp/"+outFile2+".cqp", outDirTxm + "registry/"+outFile2, pAttributes, sAttributes);
 				cwbMa.run(outFile2.toUpperCase(), outDirTxm + "registry");
 			}
 			else
 			{
-				cwbEn.run(outDirTxm + "data/"+outFile, outDir + "/wtc/"+outFile+".wtc", outDirTxm + "registry/"+outFile,pAttributecm, sAttributecm);
+				cwbEn.run(outDirTxm + "data/"+outFile, outDir + "/cqp/"+outFile+".cqp", outDirTxm + "registry/"+outFile,pAttributecm, sAttributecm);
 				cwbMa.run(outFile.toUpperCase(), outDirTxm + "registry");
 				
-				cwbEn.run(outDirTxm + "data/"+outFile2, outDir +"/wtc/"+ outFile2+".wtc", outDirTxm + "registry/"+outFile2, pAttributes, sAttributes);
+				cwbEn.run(outDirTxm + "data/"+outFile2, outDir +"/cqp/"+ outFile2+".cqp", outDirTxm + "registry/"+outFile2, pAttributes, sAttributes);
 				cwbMa.run(outFile2.toUpperCase(), outDirTxm + "registry");
 			}
 		} catch (Exception ex) {System.out.println(ex);}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/BuildGraalGSP.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/BuildGraalGSP.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/graal/BuildGraalGSP.groovy	(revision 803)
@@ -47,7 +47,7 @@
 	/** The in dir xsl. */
 	String inDirXsl;
 	 	
-	//dossier qui contiendra les gsp et vues dipl, cour, facs, trad et wtc
+	//dossier qui contiendra les gsp et vues dipl, cour, facs, trad et cqp
 	
 	/** The out dir. */
 	String outDir;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/hyperprince/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/hyperprince/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/hyperprince/compiler.groovy	(revision 803)
@@ -155,7 +155,7 @@
 	}
 	
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -323,9 +323,9 @@
 			println ("Error: CWB executables not well set.")
 			return false;
 		}
-		new File(rootDir,"wtc/hyperprince.wtc").delete();//cleaning&preparing
-		new File(rootDir,"wtc/").deleteDir();
-		new File(rootDir,"wtc/").mkdir();
+		new File(rootDir,"cqp/hyperprince.cqp").delete();//cleaning&preparing
+		new File(rootDir,"cqp/").deleteDir();
+		new File(rootDir,"cqp/").mkdir();
 		new File(rootDir,"registry/").mkdir();
 		
 		//1- Transform into WTC file
@@ -340,7 +340,7 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				def builder = new compiler(f.toURL(),txtname, "hyperprince", "default");
 				builder.setLang lang
-				builder.transfomFileWtc(rootDir,"wtc/hyperprince.wtc",f.getName());
+				builder.transfomFileWtc(rootDir,"cqp/hyperprince.cqp",f.getName());
 			}
 		}
 		
@@ -358,7 +358,7 @@
 		
 		try {
 			String regPath =outDirTxm + "/registry/"+"hyperprince"
-			cwbEn.run(outDirTxm + "data", outDir + "/wtc/"+"hyperprince.wtc", regPath,pAttributes, sAttributes);
+			cwbEn.run(outDirTxm + "data", outDir + "/cqp/"+"hyperprince.cqp", regPath,pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/lasla/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/lasla/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/lasla/compiler.groovy	(revision 803)
@@ -190,8 +190,8 @@
 			return false;
 		}
 
-		new File(rootDir,"/wtc/").deleteDir();
-		new File(rootDir,"/wtc/").mkdir();
+		new File(rootDir,"/cqp/").deleteDir();
+		new File(rootDir,"/cqp/").mkdir();
 		new File(rootDir,"/data/").deleteDir();
 		new File(rootDir,"/data/").mkdir();
 		new File(rootDir,"registry/").mkdir();
@@ -210,14 +210,14 @@
 			}
 			else
 			{	
-				wtcbuilder = new XMLTXM2WTC(f.toURL());
+				cqpbuilder = new XMLTXM2WTC(f.toURL());
 				String txtname = f.getName().substring(0,f.getName().length()-4);
-				wtcbuilder.setTextInfo(txtname, basename, "project");
+				cqpbuilder.setTextInfo(txtname, basename, "project");
 
-				wtcbuilder.setBalisesToKeep(["text"]);
-				wtcbuilder.setSendToPAttributes([]);
-				wtcbuilder.setLang(lang);
-				if(!wtcbuilder.transformFile(new File(rootDir,"wtc/"+basename+".wtc")))
+				cqpbuilder.setBalisesToKeep(["text"]);
+				cqpbuilder.setSendToPAttributes([]);
+				cqpbuilder.setLang(lang);
+				if(!cqpbuilder.transformFile(new File(rootDir,"cqp/"+basename+".cqp")))
 				{
 					println("Failed to compile "+f)
 				}
@@ -237,13 +237,13 @@
 		BuildCwbEncodeArgs argsgetter = new BuildCwbEncodeArgs();
 
 		ArrayList<String> wordstag = ["w"];
-		//argsgetter.process(new File(rootDir+"/txm",basename+".wtc"), wordstag);
+		//argsgetter.process(new File(rootDir+"/txm",basename+".cqp"), wordstag);
 		
 		String[] sAttributes = ["txmcorpus:0+lang", "text:0+id+base+project"]
 		
 		try {
 			String regPath = outDirTxm + "/registry/"+basename.toLowerCase();
-			cwbEn.run(outDirTxm + "/data", outDir + "/wtc/"+basename+".wtc", regPath, pAttributes, sAttributes);
+			cwbEn.run(outDirTxm + "/data", outDir + "/cqp/"+basename+".cqp", regPath, pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xmltxmpara/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xmltxmpara/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xmltxmpara/compiler.groovy	(revision 803)
@@ -171,15 +171,15 @@
 	}
 	
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
 	 * @return true, if successful
 	 */
-	public boolean transfomFileWtc(File wtcfile)
+	public boolean transfomFileWtc(File cqpfile)
 	{
-		createOutput(wtcfile);
+		createOutput(cqpfile);
 		String headvalue=""
 		String vAna = "";
 		String vForm = "";
@@ -370,10 +370,10 @@
 				
 		String textid = "";
 		int counttext = 0;
-		File wtcdir = new File(binDir,"wtc");
-		File wtcfile = new File(wtcdir, corpusname.toLowerCase()+".wtc");
+		File cqpdir = new File(binDir,"cqp");
+		File cqpfile = new File(cqpdir, corpusname.toLowerCase()+".cqp");
 		//0 set Lang
-		if(createOutput(wtcfile))
+		if(createOutput(cqpfile))
 		{
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
 			output.close();
@@ -390,13 +390,13 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				builder = new compiler(f.toURL(), txtname, basename, "default");
 				builder.setLang(lang);
-				if (!builder.transfomFileWtc(wtcfile))
+				if (!builder.transfomFileWtc(cqpfile))
 					return false;
 			}
 		}
 		
 		//end corpus
-		if(createOutput(wtcfile))
+		if(createOutput(cqpfile))
 		{
 			output.write("</txmcorpus>\n");
 			output.close();
@@ -453,7 +453,7 @@
 			String regPath = outDirTxm + "/registry/"+corpusname.toLowerCase();
 			cwbEn.run(
 				outDirTxm + "/data/"+corpusname+"/", 
-				wtcfile.getAbsolutePath(), 
+				cqpfile.getAbsolutePath(), 
 				regPath, pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/perrault/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/perrault/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/perrault/compiler.groovy	(revision 803)
@@ -156,7 +156,7 @@
 	}
 	
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -333,9 +333,9 @@
 			println ("binary directory does not exists: "+rootDir)
 			return false;
 		}
-		new File(rootDir+"wtc/","perrault.wtc").delete();//cleaning&preparing
-		new File(rootDir+"wtc/").deleteDir();
-		new File(rootDir+"wtc/").mkdir();
+		new File(rootDir+"cqp/","perrault.cqp").delete();//cleaning&preparing
+		new File(rootDir+"cqp/").deleteDir();
+		new File(rootDir+"cqp/").mkdir();
 		new File(rootDir+"registry/").mkdir();
 		
 		String textid="";
@@ -354,7 +354,7 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				def builder = new compiler(f.toURL(), txtname, "perrault", "default");
 				builder.setLang(lang);
-				builder.transfomFileWtc(rootDir+"wtc","perrault.wtc");
+				builder.transfomFileWtc(rootDir+"cqp","perrault.cqp");
 			}
 		}
 		
@@ -371,7 +371,7 @@
 		
 		try
 		{
-			cwbEn.run(outDirTxm + "data", outDir + "/wtc/"+"perrault.wtc", outDirTxm + "registry/"+"perrault",pAttributes, sAttributes);
+			cwbEn.run(outDirTxm + "data", outDir + "/cqp/"+"perrault.cqp", outDirTxm + "registry/"+"perrault",pAttributes, sAttributes);
 			cwbMa.run("PERRAULT", outDirTxm + "registry");
 			
 		} catch (Exception ex) {System.out.println(ex); return false;}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/perrault/allimport.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/perrault/allimport.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/perrault/allimport.groovy	(revision 803)
@@ -414,7 +414,7 @@
 }
 
 /**
- * Transfom file wtc.
+ * Transfom file cqp.
  *
  * @param dirPathName the dir path name
  * @param fileName the file name
@@ -590,9 +590,9 @@
 		println ("binary directory does not exists: "+rootDir)
 		return false;
 	}
-	new File(rootDir+"wtc/","perrault.wtc").delete();//cleaning&preparing
-	new File(rootDir+"wtc/").deleteDir();
-	new File(rootDir+"wtc/").mkdir();
+	new File(rootDir+"cqp/","perrault.cqp").delete();//cleaning&preparing
+	new File(rootDir+"cqp/").deleteDir();
+	new File(rootDir+"cqp/").mkdir();
 	new File(rootDir+"registry/").mkdir();
 
 	String textid="";
@@ -609,7 +609,7 @@
 		{
 			println("process file "+f)
 			compil(f.toURL(),"text"+counttext,"perrault","default");
-			transfomFileWtc(rootDir+"wtc","perrault.wtc");
+			transfomFileWtc(rootDir+"cqp","perrault.cqp");
 		}
 	}
 
@@ -626,7 +626,7 @@
 
 	try
 	{
-		cwbEn.run(outDirTxm + "data/"+"PERRAULT", outDir + "/wtc/"+"perrault.wtc", outDirTxm + "registry/"+"perrault",pAttributes, sAttributes);
+		cwbEn.run(outDirTxm + "data/"+"PERRAULT", outDir + "/cqp/"+"perrault.cqp", outDirTxm + "registry/"+"perrault",pAttributes, sAttributes);
 		cwbMa.run("PERRAULT", outDirTxm + "registry");
 
 	} catch (Exception ex) {System.out.println(ex); return false;}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xml/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xml/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xml/compiler.groovy	(revision 803)
@@ -206,15 +206,15 @@
 	}
 
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
 	 * @return true, if successful
 	 */
-	public boolean transfomFileWtc(File wtcFile, HashMap<String, String> textmetadata)
+	public boolean transfomFileWtc(File cqpFile, HashMap<String, String> textmetadata)
 	{
-		if (!createOutput(wtcFile))
+		if (!createOutput(cqpFile))
 			return false;
 
 		String headvalue=""
@@ -393,7 +393,7 @@
 			File errorDir = null		
 			try {
 				xmlFile = new File(url.getFile())
-				errorDir = new File(wtcFile.getParentFile(), "compiler-error")
+				errorDir = new File(cqpFile.getParentFile(), "compiler-error")
 				println "Warning: Moving $xmlFile to $errorDir"
 				errorDir.mkdir();
 				FileCopy.copy(xmlFile, new File(errorDir, xmlFile.getName()))
@@ -455,9 +455,9 @@
 			return false;
 		}
 
-		File wtcFile = new File(binDir, "wtc/"+corpusname+".wtc")
-		new File(binDir, "wtc").deleteDir()
-		new File(binDir, "wtc").mkdir()
+		File cqpFile = new File(binDir, "cqp/"+corpusname+".cqp")
+		new File(binDir, "cqp").deleteDir()
+		new File(binDir, "cqp").mkdir()
 		new File(binDir, "data").deleteDir()
 		new File(binDir, "data").mkdir()
 		new File(binDir, "registry").mkdir()
@@ -469,7 +469,7 @@
 		def builder = null
 
 		//start corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("<txmcorpus lang=\""+lang+"\">\n")
 			output.close()
 		}
@@ -522,14 +522,14 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4)
 				builder = new compiler(f.toURI().toURL(), txtname, corpusname, "default")
 				builder.setLang(lang);
-				if (!builder.transfomFileWtc(wtcFile, textmetadata)) {
+				if (!builder.transfomFileWtc(cqpFile, textmetadata)) {
 					println("Failed to compile "+f)
 				}
 			}
 		}
 
 		//end corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("</txmcorpus>\n")
 			output.close()
 		}
@@ -680,7 +680,7 @@
 			String regPath = outDir + "/registry/"+corpusname.toLowerCase();
 			cwbEn.run(
 				outDir + "/data/$corpusname", 
-				outDir + "/wtc/"+corpusname+".wtc", 
+				outDir + "/cqp/"+corpusname+".cqp", 
 				regPath, pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/bfm/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/bfm/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/bfm/compiler.groovy	(revision 803)
@@ -244,16 +244,16 @@
 	}
 
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
 	 * @return true, if successful
 	 */
-	private boolean transfomFileWtc(File wtcFile)
+	private boolean transfomFileWtc(File cqpFile)
 	{
 		try {
-			if (!createOutput(wtcFile)) return false;
+			if (!createOutput(cqpFile)) return false;
 
 			String headvalue = ""
 			String vAna = "";
@@ -761,9 +761,9 @@
 			return false;
 		}
 
-		File wtcFile = new File(binDir, "wtc/${corpusname}.wtc");
-		new File(binDir, "/wtc/").deleteDir();
-		new File(binDir, "/wtc/").mkdir();
+		File cqpFile = new File(binDir, "cqp/${corpusname}.cqp");
+		new File(binDir, "/cqp/").deleteDir();
+		new File(binDir, "/cqp/").mkdir();
 		new File(binDir, "/data/${corpusname}").deleteDir();
 		new File(binDir, "/data/${corpusname}").mkdir();
 		new File(binDir, "registry/").mkdir();
@@ -830,8 +830,8 @@
 		println("process "+files.size()+" files ")
 		//println("files: $files")
 		//write txmcorpus
-		if (!createOutput(wtcFile)) {
-			println "Error: could not write wtc file"
+		if (!createOutput(cqpFile)) {
+			println "Error: could not write cqp file"
 			return false;
 		} else {
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
@@ -848,7 +848,7 @@
 				String txtname = f.getName().substring(0, f.getName().length()-4);
 				def builder = new compiler(f.toURI().toURL(), txtname, corpusname, "default", metadataXPath);
 				builder.setLang(lang)
-				if (!builder.transfomFileWtc(wtcFile)) {
+				if (!builder.transfomFileWtc(cqpFile)) {
 					println "Failed to compile "+f
 				}
 				builder.setAnnotationDone(this.annotate_status);
@@ -856,8 +856,8 @@
 		}
 
 		//close txmcorpus
-		if (!createOutput(wtcFile)) {
-			println "Error: could not write wtc file"
+		if (!createOutput(cqpFile)) {
+			println "Error: could not write cqp file"
 			return false;
 		} else {
 			output.write("</txmcorpus>\n");
@@ -945,7 +945,7 @@
 
 		try {
 			String regPath = outDir + "/registry/"+corpusname.toLowerCase(); // CQP wants lower case registry files
-			cwbEn.run(outDir + "/data/${corpusname}", outDir + "/wtc/"+corpusname+".wtc", regPath,pAttributes, sAttributes);
+			cwbEn.run(outDir + "/data/${corpusname}", outDir + "/cqp/"+corpusname+".cqp", regPath,pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/tmx/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/tmx/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/tmx/compiler.groovy	(revision 803)
@@ -159,7 +159,7 @@
 	private boolean createOutput(String dirPathName, String fileName){
 		try {
 			File f = new File(dirPathName, fileName)
-			//We don't want to concatenate the wtc files
+			//We don't want to concatenate the cqp files
 			output = new OutputStreamWriter(new FileOutputStream(f, f.exists()) , "UTF-8");
 			return true;
 		} catch (Exception e) {
@@ -183,7 +183,7 @@
 	}
 
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -439,8 +439,8 @@
 			return false;
 		}
 
-		new File(binDir,"/wtc/").deleteDir();
-		new File(binDir,"/wtc/").mkdir();
+		new File(binDir,"/cqp/").deleteDir();
+		new File(binDir,"/cqp/").mkdir();
 		new File(binDir,"/data/").deleteDir();
 		new File(binDir,"/data/").mkdir();
 		new File(binDir,"registry/").mkdir();
@@ -464,17 +464,17 @@
 		}
 		println "Using corpus ID: $corpusIDS"
 		
-		String wtcName;
+		String cqpName;
 		for (int group : langGroups.keySet()) {
 			String lang = langs.get(langGroups.get(group)[0]);
 			segs_id.put(group, 0);
-			wtcName = basename+"_"+corpusIDS.get(group);
-			createOutput(rootDir+"/wtc", "${wtcName}.wtc");
-			output.write("<txmcorpus id=\"${wtcName}\" lang=\"$lang\">\n")
+			cqpName = basename+"_"+corpusIDS.get(group);
+			createOutput(rootDir+"/cqp", "${cqpName}.cqp");
+			output.write("<txmcorpus id=\"${cqpName}\" lang=\"$lang\">\n")
 			output.close();
 
 			//create txmDirs
-			new File(rootDir, "txm/"+wtcName.toUpperCase()).mkdir();
+			new File(rootDir, "txm/"+cqpName.toUpperCase()).mkdir();
 		}
 
 		//1- Transform into WTC file and build a corpus per file
@@ -483,7 +483,7 @@
 		def builder = null;
 		for (int group : langGroups.keySet()) {
 			//String lang = langs.get(langGroups.get(group)[0]);
-			wtcName = basename+"_"+corpusIDS.get(group);
+			cqpName = basename+"_"+corpusIDS.get(group);
 			def filenames = langGroups.get(group);
 			filenames.sort()
 			//println("Process group no $group of files "+filenames)
@@ -496,19 +496,19 @@
 				}
 
 				filename = filename.substring(0, filename.length()-4);
-				String corpusname = (wtcName).toLowerCase();
+				String corpusname = (cqpName).toLowerCase();
 				counttext++;
 
 				String txtname = f.getName();
 				txtname = txtname.substring(0, txtname.lastIndexOf("_"));
 				seg_id = segs_id.get(group);
 				builder = new compiler(f.toURI().toURL(), txtname, basename, "default", tuprops);
-				builder.transfomFileWtc(rootDir+"/wtc",wtcName+".wtc");
-				anaTypesPerWtc[wtcName] = builder.getAnaTypes();
+				builder.transfomFileWtc(rootDir+"/cqp",cqpName+".cqp");
+				anaTypesPerWtc[cqpName] = builder.getAnaTypes();
 				segs_id.put(group, seg_id);
 
 				// move xml-txm file
-				File txmCorpusDir = new File(rootDir, "txm/"+wtcName.toUpperCase())
+				File txmCorpusDir = new File(rootDir, "txm/"+cqpName.toUpperCase())
 				f.renameTo(new File(txmCorpusDir, f.getName()));
 			}
 		}
@@ -516,7 +516,7 @@
 		
 		for (int group : langGroups.keySet()) {
 			//String lang = langs.get(langGroups.get(group)[0]);
-			createOutput(rootDir+"/wtc", basename+"_"+corpusIDS.get(group)+".wtc");
+			createOutput(rootDir+"/cqp", basename+"_"+corpusIDS.get(group)+".cqp");
 			output.write("</txmcorpus>")
 			output.close();
 		}
@@ -529,9 +529,9 @@
 		def outDir = rootDir;
 		def outDirTxm = rootDir;
 
-		def wtcFiles = [:]
-		for (File wtcfile : new File(rootDir, "wtc").listFiles()) {
-			String corpusname = wtcfile.getName();
+		def cqpFiles = [:]
+		for (File cqpfile : new File(rootDir, "cqp").listFiles()) {
+			String corpusname = cqpfile.getName();
 			
 			corpusname = corpusname.substring(0, corpusname.length()-4);
 			def corpusAnaTypes = anaTypesPerWtc[corpusname];
@@ -583,9 +583,9 @@
 			println "S-attributes: "+sargs
 
 			try {
-				wtcFiles[corpusname.toLowerCase()] = outDir + "/wtc/"+wtcfile.getName();
+				cqpFiles[corpusname.toLowerCase()] = outDir + "/cqp/"+cqpfile.getName();
 				String regPath = outDirTxm + "/registry/"+corpusname.toLowerCase()
-				cwbEn.run(outDirTxm + "/data/"+corpusname.toUpperCase()+"/", outDir + "/wtc/"+wtcfile.getName(), regPath, pAttributes, sAttributes);
+				cwbEn.run(outDirTxm + "/data/"+corpusname.toUpperCase()+"/", outDir + "/cqp/"+cqpfile.getName(), regPath, pAttributes, sAttributes);
 				if (!new File(regPath).exists()) {
 					println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 					return false;
@@ -604,11 +604,11 @@
 						try {
 							PatchCwbRegistry.patchAlignment(new File(registryDirectory, corpusName.getName()), targetName.getName());
 							
-							File wtcFile1 = new File(wtcFiles[corpusName.getName()]);
-							File wtcFile2 = new File(wtcFiles[targetName.getName()]);
+							File cqpFile1 = new File(cqpFiles[corpusName.getName()]);
+							File cqpFile2 = new File(cqpFiles[targetName.getName()]);
 							File alignOutFile = new File(outDir, "align.out");
 							
-							BuildAlignOut bao = new BuildAlignOut(wtcFile1, wtcFile2);
+							BuildAlignOut bao = new BuildAlignOut(cqpFile1, cqpFile2);
 							if (!bao.process(alignOutFile, "seg", "id")) {
 								println "Error while creating alignement file of $corpusName. Aborting."
 								return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/bvh/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/bvh/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/bvh/compiler.groovy	(revision 803)
@@ -162,7 +162,7 @@
 	}
 	
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -545,9 +545,9 @@
 			println ("binary directory does not exists: "+rootDir)
 			return false;
 		}
-		new File(rootDir+"/wtc/","bvh.wtc").delete();//cleaning&preparing
-		new File(rootDir,"/wtc/").deleteDir();
-		new File(rootDir,"/wtc/").mkdir();
+		new File(rootDir+"/cqp/","bvh.cqp").delete();//cleaning&preparing
+		new File(rootDir,"/cqp/").deleteDir();
+		new File(rootDir,"/cqp/").mkdir();
 		new File(rootDir,"/data/").deleteDir();
 		new File(rootDir,"/data/").mkdir();
 		new File(rootDir,"registry/").mkdir();
@@ -570,7 +570,7 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				def builder = new compiler(f.toURL(),txtname, "bvh", "default");
 				builder.setLang lang
-				builder.transfomFileWtc(rootDir+"/wtc","bvh.wtc");
+				builder.transfomFileWtc(rootDir+"/cqp","bvh.cqp");
 			}
 		}
 		
@@ -586,7 +586,7 @@
 		String[] sAttributes = ["txmcorpus:0+lang", "text:2+id+type+base+project","div:2+id+type","p:0+id","q:0+id","said:0+id","foreign:0+id","lg:0+id","l:0+id","sp:0+id","speaker:0+id","stage:0+id"];
 		try {
 			String regPath = outDirTxm + "/registry/"+"bvh"
-			cwbEn.run(outDirTxm + "/data", outDir + "/wtc/"+"bvh.wtc", regPath, pAttributes, sAttributes);
+			cwbEn.run(outDirTxm + "/data", outDir + "/cqp/"+"bvh.cqp", regPath, pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/discours/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/discours/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/discours/compiler.groovy	(revision 803)
@@ -180,16 +180,16 @@
 			println ("Error: CWB executables not well set.")
 			return false;
 		}
-		File wtcFile = new File(binDir,"wtc/${corpusname}.wtc");
-		new File(binDir, "wtc.").deleteDir();
-		new File(binDir, "wtc").mkdirs();
+		File cqpFile = new File(binDir,"cqp/${corpusname}.cqp");
+		new File(binDir, "cqp.").deleteDir();
+		new File(binDir, "cqp").mkdirs();
 		new File(binDir, "data/$corpusname").deleteDir();
 		new File(binDir, "data/$corpusname").mkdir();
 		new File(binDir, "registry").deleteDir();
 		new File(binDir, "registry").mkdir();
 
 		//start corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
 			output.close();
 		}
@@ -198,33 +198,33 @@
 		//1- Transform into WTC file
 
 		Collections.sort(files);
-		XMLTXM2WTC wtcbuilder = null;
+		XMLTXM2WTC cqpbuilder = null;
 		for (File f : files) {
 			if (second) { print(", ") }
 			if (second > 0 && (second % 5) == 0) println ""
 			print(f.getName().replaceFirst("\\.xml", ""));
 			second++
 
-			wtcbuilder = new XMLTXM2WTC(f.toURI().toURL());
+			cqpbuilder = new XMLTXM2WTC(f.toURI().toURL());
 			String txtname = f.getName().substring(0,f.getName().length()-4);
-			wtcbuilder.setTextInfo(txtname, corpusname, "project");
+			cqpbuilder.setTextInfo(txtname, corpusname, "project");
 
-			wtcbuilder.setBalisesToKeep(["text","p","s"]);
-			wtcbuilder.setSendToPAttributes(["s":["id"], "p":["id"]]);
-			wtcbuilder.setLang(lang);
-			if (!wtcbuilder.transformFile(wtcFile)) {
+			cqpbuilder.setBalisesToKeep(["text","p","s"]);
+			cqpbuilder.setSendToPAttributes(["s":["id"], "p":["id"]]);
+			cqpbuilder.setLang(lang);
+			if (!cqpbuilder.transformFile(cqpFile)) {
 				println("Failed to compile "+f)
 			}
 
 		}
 
 		//end corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("</txmcorpus>\n");
 			output.close();
 		}
 
-		if (wtcbuilder == null) {
+		if (cqpbuilder == null) {
 			println "there was no files to process: "+files
 			return false;
 		}
@@ -235,8 +235,8 @@
 		CwbEncode cwbEn = new CwbEncode();
 		CwbMakeAll cwbMa = new CwbMakeAll();
 
-		List<String> pAttributesList = wtcbuilder.getpAttributs();
-		List<String> sAttributesList = wtcbuilder.getsAttributs();
+		List<String> pAttributesList = cqpbuilder.getpAttributs();
+		List<String> sAttributesList = cqpbuilder.getsAttributs();
 		println "pAttrs : "+pAttributesList
 		println "sAttrs : "+sAttributesList
 		String[] pAttributes = pAttributesList.toArray(new String[pAttributesList.size()])
@@ -248,7 +248,7 @@
 			String regPath = outDir + "registry/"+corpusname.toLowerCase()
 			cwbEn.run(
 					outDir + "data/$corpusname",
-					outDir + "/wtc/"+corpusname+".wtc",
+					outDir + "/cqp/"+corpusname+".cqp",
 					regPath,
 					pAttributes,
 					sAttributes);
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/RGAQCJ/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/RGAQCJ/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/RGAQCJ/compiler.groovy	(revision 803)
@@ -161,7 +161,7 @@
 	}
 	
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -516,9 +516,9 @@
 			println ("binary directory does not exists: "+rootDir)
 			return false;
 		}
-		new File(rootDir+"/wtc/","bfm3tt.wtc").delete();//cleaning&preparing
-		new File(rootDir,"/wtc/").deleteDir();
-		new File(rootDir,"/wtc/").mkdir();
+		new File(rootDir+"/cqp/","bfm3tt.cqp").delete();//cleaning&preparing
+		new File(rootDir,"/cqp/").deleteDir();
+		new File(rootDir,"/cqp/").mkdir();
 		new File(rootDir,"/data/").deleteDir();
 		new File(rootDir,"/data/").mkdir();
 		new File(rootDir,"registry/").mkdir();
@@ -539,7 +539,7 @@
 				println("process file "+f)
 				def builder = new compiler(f.toURL(),f.getName(),"bfm3tt","default");
 				builder.setLang(lang);
-				builder.transfomFileWtc(rootDir+"/wtc","bfm3tt.wtc");
+				builder.transfomFileWtc(rootDir+"/cqp","bfm3tt.cqp");
 			}
 		}
 		
@@ -554,7 +554,7 @@
 		 String[] sAttributes = ["txmcorpus:0+lang","text:0+id+titre+auteur+datecompo+ssiecle+domaine+genre+forme+dialecte+base+project","front:0+n","body:0+n","ab:0+n+rend","div:0+id+type","q:1+n","p:0+n","back:0+n"];
 		 try
 		 {
-		 cwbEn.run(outDirTxm + "/data", outDir + "/wtc/"+"bfm3tt.wtc", outDirTxm + "/registry/"+"bfm3tt",pAttributes, sAttributes);
+		 cwbEn.run(outDirTxm + "/data", outDir + "/cqp/"+"bfm3tt.cqp", outDirTxm + "/registry/"+"bfm3tt",pAttributes, sAttributes);
 		 cwbMa.run("BFM3TT", outDirTxm + "/registry");
 		 } catch (Exception ex) {System.out.println(ex); return false;}
 		 
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/RGAQCJ/importRGAQCJ.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/RGAQCJ/importRGAQCJ.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/RGAQCJ/importRGAQCJ.groovy	(revision 803)
@@ -169,7 +169,7 @@
 	} 
 	
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -345,7 +345,7 @@
 	 */
 	public static void process(List<String> files, String rootDir) 
 	{
-		new File(rootDir+"wtc/").mkdir();
+		new File(rootDir+"cqp/").mkdir();
 		new File(rootDir+"registry/").mkdir();
 		//String[] files = ["roland-ana.xml","qgraal_cm-ana.xml","artu-ana.xml","qjm-ana.xml","commyn1-ana.xml","jehpar-ana.xml"];
 		//String rootDir = "~/xml/rgaqcj/";
@@ -353,7 +353,7 @@
 		println(types);
 		
 		//1- Transform into WTC file
-		File f = new File(rootDir+"wtc/","RGAQCJ.wtc");
+		File f = new File(rootDir+"cqp/","RGAQCJ.cqp");
 		f.delete();
 		
 		def output = new OutputStreamWriter(new FileOutputStream(f) , "UTF-8");
@@ -367,7 +367,7 @@
 			println("process file "+files[i])
 			String file = files[i]; 
 			def builder = new BuildXmlRGAQCJ(new File(rootDir+"/anainline/",file).toURL(),""+initiales.charAt(i),types);
-			builder.transfomFileWtc(rootDir+"wtc","RGAQCJ.wtc");
+			builder.transfomFileWtc(rootDir+"cqp","RGAQCJ.cqp");
 		}
 		
 		output = new OutputStreamWriter(new FileOutputStream(f,true) , "UTF-8");
@@ -391,12 +391,12 @@
 		{
 			if (System.getProperty("os.name").contains("Windows"))
 			{
-				cwbEn.run(outDirTxm + "data/"+"RGAQCJ", outDir +"wtc/"+"RGAQCJ"+".wtc", outDirTxm + "registry/"+"rgaqcj",pAttributes, sAttributes);
+				cwbEn.run(outDirTxm + "data/"+"RGAQCJ", outDir +"cqp/"+"RGAQCJ"+".cqp", outDirTxm + "registry/"+"rgaqcj",pAttributes, sAttributes);
 				cwbMa.run("RGAQCJ", outDirTxm + "registry");
 			}
 			else
 			{
-				cwbEn.run(outDirTxm + "data/"+"RGAQCJ", outDir + "/wtc/"+"RGAQCJ.wtc", outDirTxm + "registry/"+"rgaqcj",pAttributes, sAttributes);
+				cwbEn.run(outDirTxm + "data/"+"RGAQCJ", outDir + "/cqp/"+"RGAQCJ.cqp", outDirTxm + "registry/"+"rgaqcj",pAttributes, sAttributes);
 				cwbMa.run("RGAQCJ", outDirTxm + "registry");
 
 			}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/ImportXmlTag.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/ImportXmlTag.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/ImportXmlTag.groovy	(revision 803)
@@ -179,18 +179,18 @@
 	public static void main(String[] args) {
 
 		String rootDir = "~/xml/rgaqcj/";
-		new File(rootDir+"/wtc/").mkdir();
+		new File(rootDir+"/cqp/").mkdir();
 		new File(rootDir,"/registry/").mkdir();
 
 		File srcfile = new File(rootDir+"/src/","roland.xml");
-		File resultfile = new File(rootDir+"/wtc/","roland-xmltag.wtc");
+		File resultfile = new File(rootDir+"/cqp/","roland-xmltag.cqp");
 		println("importXmlTag : "+srcfile+" to : "+resultfile );
 
 		def builder = new ImportXmlTag(srcfile.toURL());
 		builder.process(resultfile);
 
 		def inDir = rootDir;
-		def outDir =rootDir+"wtc/";
+		def outDir =rootDir+"cqp/";
 		def outDirTxm = rootDir;
 		CwbEncode cwbEn = new CwbEncode();
 		CwbMakeAll cwbMa = new CwbMakeAll();
@@ -199,7 +199,7 @@
 		String[] sAttributes = ["children:"+builder.maxprof+"+n"];
 
 		try {
-			cwbEn.run(outDirTxm + "data/"+"ROLANDXML", outDir +"roland-xmltag.wtc", outDirTxm + "registry/"+"rolandxml",pAttributes, sAttributes);
+			cwbEn.run(outDirTxm + "data/"+"ROLANDXML", outDir +"roland-xmltag.cqp", outDirTxm + "registry/"+"rolandxml",pAttributes, sAttributes);
 			cwbMa.run("ROLANDXML", outDirTxm + "registry");
 		} catch (Exception ex) {System.out.println(ex);}
 
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/compiler.groovy	(revision 0)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/compiler.groovy	(revision 803)
@@ -0,0 +1,201 @@
+
+
+// Copyright © 2010-2013 ENS de Lyon.
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+//
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+//
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+//
+//
+//
+// $LastChangedDate: 2012-01-05 14:27:34 +0100 (jeu., 05 janv. 2012) $
+// $LastChangedRevision: 2096 $
+// $LastChangedBy: mdecorde $
+//
+package org.txm.importer.cqp
+
+import org.txm.Toolbox;
+import org.txm.importer.cwb.*
+import org.txm.importer.*;
+import org.txm.scripts.*;
+import org.txm.scripts.teitxm.*;
+import org.txm.utils.io.FileCopy;
+import org.txm.utils.treetagger.TreeTagger;
+import java.util.ArrayList;
+import javax.xml.stream.*;
+import java.net.URL;
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class compiler.
+ */
+class compiler
+{
+	/** The debug. */
+	boolean debug = false;
+
+	/** The dir. */
+	private def dir;
+
+	File srcWTCFile, srcRegistryFile;
+
+	public def pAttributesList = [];
+	public def sAttributesList = [];
+
+	public compiler(File cqpFile, File registryFile) {
+		this.srcWTCFile = cqpFile;
+		this.srcRegistryFile = registryFile
+	}
+
+	/**
+	 * Sets the debug.
+	 *
+	 * @return the java.lang. object
+	 */
+	public setDebug()
+	{
+		debug =true;
+	}
+
+	/**
+	 * Run.
+	 *
+	 * @param rootDirFile the root dir file
+	 * @param basename the basename
+	 * @return true, if successful
+	 */
+	public boolean run(File binDir, String corpusname)
+	{
+		if (!(CwbEncode.isExecutableAvailable() && CwbMakeAll.isExecutableAvailable())) {
+			println ("Error: CWB executables not well set.")
+			return false;
+		}
+		if (!binDir.exists()) {
+			println ("binary directory does not exists: "+binDir)
+			return false;
+		}
+
+		if (!srcWTCFile.exists()) {
+			println "Error: cannot find the WTC file $srcWTCFile"
+			return false;
+		}
+
+		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
+		new File(binDir, "cqp").deleteDir();
+		new File(binDir, "cqp").mkdir();
+		new File(binDir, "data").deleteDir();
+		new File(binDir, "data").mkdir();
+		new File(binDir, "registry").mkdir();
+
+		FileCopy.copy(srcWTCFile, cqpFile);
+
+		//2- Import into CWB
+		def outDir = binDir.getAbsolutePath()+"/";
+
+		CwbEncode cwbEn = new CwbEncode();
+		CwbMakeAll cwbMa = new CwbMakeAll();
+		cwbEn.setDebug(debug);
+		cwbMa.setDebug(debug);
+
+		String[] pAttributes;
+		String[] sAttributes;
+
+		if (srcRegistryFile == null) {
+			println "WARNING: No registry file found in source directory"
+			println "We'll search for positional attributes and structural attributes in the WTC file"
+
+			// s attributes
+			BuildCwbEncodeArgsFromWTC argsgetter = new BuildCwbEncodeArgsFromWTC(); // XML stream
+			argsgetter.process(cqpFile); //$NON-NLS-1$
+			sAttributesList = argsgetter.getSAttributes();
+
+			// p attributes
+			int nbAttr = -1;
+			File tmp = File.createTempFile("txm", ".cqp", cqpFile.getParentFile());
+			int wcounter = 1;
+			println "Adding the 'id' property to the WTC file and getting word properties number."
+			tmp.withWriter("UTF-8") { writer ->
+				cqpFile.eachLine("UTF-8") { line ->
+					if (!line.startsWith("<")) {
+						if (nbAttr == -1) nbAttr = line.split("\t").size();
+						writer.println(line+"\tw_"+(wcounter++))
+					} else {
+						writer.println(line)
+					}
+					writer.flush();
+				}
+			}
+			cqpFile.delete()
+			tmp.renameTo(cqpFile)
+
+			System.out.println("Found "+(nbAttr-1)+" word properties, $nbAttr with the 'id'");
+			for (int i = 1; i < nbAttr ; i++) {
+				pAttributesList << "p$i";
+			}
+			pAttributesList << "id"
+		} else {
+			ReadRegistryFile reader = new ReadRegistryFile(srcRegistryFile);
+			pAttributesList = reader.getPAttributes();
+			sAttributesList = reader.getSAttributes();
+			pAttributesList.remove(0) // remove word
+
+			if (!pAttributesList.contains("id")) {
+				System.out.println("Error: The registry file does not declare the 'id' word property");
+				return false;
+			}
+		}
+
+		pAttributes = pAttributesList; // cast to array
+		sAttributes = sAttributesList; // cast to array
+
+		println "pAttrs : "+Arrays.toString(pAttributes)
+		println "sAttrs : "+Arrays.toString(sAttributes)
+
+		try {
+			cwbEn.setDebug(debug);
+			cwbMa.setDebug(debug);
+			String regPath =outDir + "/registry/"+corpusname.toLowerCase()
+			cwbEn.run(outDir + "/data/$corpusname", 
+					cqpFile.getAbsolutePath(),
+					regPath, pAttributes, sAttributes);
+			if (!new File(regPath).exists()) {
+				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
+				return false;
+			}
+			cwbMa.run(corpusname, outDir + "/registry");
+			return true;
+		} catch (Exception ex) {System.out.println(ex); return false;}
+
+		return true;
+	}
+
+	/**
+	 * The main method.
+	 *
+	 * @param args the arguments
+	 */
+	public static void main(String[] args)
+	{
+		File dir = new File("~/xml/perrault/txm/");
+		List<File> files = dir.listFiles();
+		new compiler().run(files);
+	}
+}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/cqpLoader.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/cqpLoader.groovy	(revision 0)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/cqpLoader.groovy	(revision 803)
@@ -0,0 +1,151 @@
+package org.txm.importer.cqp
+
+import org.txm.importer.cwb.BuildCwbEncodeArgs;
+import java.io.File;
+import java.util.ArrayList;
+
+import org.txm.objects.*;
+import org.txm.scripts.teitxm.*;
+import org.txm.*;
+import org.txm.utils.i18n.*;
+import org.txm.metadatas.*;
+import org.txm.utils.io.FileCopy;
+import org.w3c.dom.Element
+import org.txm.utils.xml.DomUtils;
+
+String userDir = System.getProperty("user.home");
+
+def MONITOR;
+boolean debug = org.txm.utils.logger.Log.isPrintingErrors();
+BaseParameters params;
+try {params = paramsBinding;MONITOR=monitor} catch (Exception)
+{	println "DEV MODE";//exception means we debug
+	debug = true
+	params = new BaseParameters(new File(userDir, "xml/cqp/import.xml"))
+	params.load()
+	if (!org.txm.Toolbox.isInitialized()) {
+		Toolbox.setParam(Toolbox.INSTALL_DIR,new File("/usr/lib/TXM"));
+		//Toolbox.setParam(Toolbox.INSTALL_DIR,new File("C:\\Program Files\\TXM"));//For Windows
+		Toolbox.setParam(Toolbox.TREETAGGER_INSTALL_PATH,new File(userDir,"treetagger"));
+		//Toolbox.setParam(Toolbox.TREETAGGER_INSTALL_PATH,new File("C:\\Program Files\\treetagger"));//for Windows
+		Toolbox.setParam(Toolbox.TREETAGGER_MODELS_PATH,new File(userDir,"treetagger/models"));
+		Toolbox.setParam(Toolbox.METADATA_ENCODING, "UTF-8");
+		Toolbox.setParam(Toolbox.METADATA_COLSEPARATOR, ",");
+		Toolbox.setParam(Toolbox.METADATA_TXTSEPARATOR, "\"");
+		//Toolbox.setParam(Toolbox.TREETAGGER_MODELS_PATH,new File("C:\\Program Files\\treetagger\\models"));//for Windows
+		Toolbox.setParam(Toolbox.USER_TXM_HOME, new File(System.getProperty("user.home"), "TXM"));
+	}
+}
+if (params == null) { println "no parameters. Aborting"; return; }
+
+String corpusname = params.getCorpusName();
+Element corpusElem = params.corpora.get(corpusname);
+String basename = params.name;
+String rootDir = params.rootDir;
+String lang = corpusElem.getAttribute("lang");
+String model = lang
+String encoding = corpusElem.getAttribute("encoding");
+boolean annotate = "true" == corpusElem.getAttribute("annotate");
+String xsl = params.getXsltElement(corpusElem).getAttribute("xsl")
+def xslParams = params.getXsltParams(corpusElem);
+int wordsPerPage = params.getWordsPerPage("default")
+boolean build_edition = params.getDoEdition("default")
+
+File srcDir = new File(rootDir);
+File binDir = new File(Toolbox.getTXMHOMEPATH(),"corpora/"+basename);
+binDir.deleteDir();
+binDir.mkdirs();
+if (!binDir.exists()) {
+	println "Could not create binDir "+binDir
+	return;
+}
+
+// FAKE: will contains no XML-TXM files
+File txmDir = new File(binDir, "txm/$corpusname");
+txmDir.deleteDir();
+txmDir.mkdirs();
+
+// Will contains the edition files
+File htmlDir = new File(binDir, "HTML/$corpusname");
+htmlDir.deleteDir();
+htmlDir.mkdirs();
+
+// get the cqp file and the registry file
+File cqpFile;
+File registryFile;
+println "Looking for files to process..."
+for(File f : srcDir.listFiles()) {
+	if (f.isHidden()) continue;
+	if (f.isDirectory()) continue;
+	if (f.getName().endsWith(".cqp")) {
+		if (cqpFile == null) {
+			cqpFile = f;
+			println "Using WTC file : $cqpFile"
+		}
+	} else if (f.getName().endsWith(".xml")) {
+
+	} else if (!f.getName().contains(".")){ // its the registry file
+		if (registryFile == null) {
+			registryFile = f;
+			println "Using registry file : $f"
+		}
+	}
+}
+
+if (cqpFile == null) {
+	println "No WTC file in source directory: "+srcDir;
+	return false;
+}
+
+// get pAttributes an run cwb-encode + cwb-makeall
+if (MONITOR != null && MONITOR.isCanceled()) { return MONITOR.done(); }
+if (MONITOR != null) MONITOR.worked(25, "COMPILING")
+println "-- COMPILING - Building Search Engine indexes"
+def c = new compiler(cqpFile, registryFile)
+c.setDebug(debug)
+if (!c.run(binDir, corpusname)) {
+	println "Import stopped"
+	return;
+}
+
+if (MONITOR != null && MONITOR.isCanceled()) { return MONITOR.done(); }
+
+new File(binDir,"HTML/$corpusname").deleteDir();
+new File(binDir,"HTML/$corpusname").mkdirs();
+if (build_edition) {
+	
+	println "-- EDITION - Building edition"
+	if (MONITOR != null) MONITOR.worked(20, "EDITION - Building edition")
+
+	File outdir = new File(binDir,"/HTML/$corpusname/default/");
+	outdir.mkdirs();
+
+	print "."
+
+	List<String> NoSpaceBefore = LangFormater.getNoSpaceBefore(lang);
+	List<String> NoSpaceAfter = LangFormater.getNoSpaceAfter(lang);
+
+	File binWtcFile = new File(binDir,"cqp/"+corpusname+".cqp");
+	def ed = new pager(binWtcFile, outdir, NoSpaceBefore, NoSpaceAfter, wordsPerPage, basename, registryFile !=null, c.pAttributesList);
+	def allIndexes = ed.getIdx();
+	def allPages = ed.getPageFiles();
+	for (String txtname : ed.getTextNames()) {
+		def txtIndexes = allIndexes[txtname];
+		def txtPages = allPages[txtname];
+
+		Element text = params.addText(params.corpora.get(corpusname), txtname, cqpFile);
+		Element edition = params.addEdition(text, "default", outdir.getAbsolutePath(), "html");
+
+		for (i = 0 ; i < txtPages.size();) {
+			File f = txtPages.get(i);
+			String wordid = txtIndexes.get(i);
+			params.addPage(edition, ""+(++i), wordid);
+		}
+	}
+}
+println ""
+
+if (MONITOR != null && MONITOR.isCanceled()) { return MONITOR.done(); }
+if (MONITOR != null) MONITOR.worked(20, "FINALIZING")
+File paramFile = new File(binDir, "import.xml");
+DomUtils.save(params.root.getOwnerDocument(), paramFile);readyToLoad = true;
\ No newline at end of file
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/package.html
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/package.html	(revision 0)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/package.html	(revision 803)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>CWB import module.</p>
+</body>
+</html>
\ No newline at end of file

Property changes on: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/package.html
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/pager.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/pager.groovy	(revision 0)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/cqp/pager.groovy	(revision 803)
@@ -0,0 +1,354 @@
+package org.txm.importer.cqp;
+//Copyright © - ANR Textométrie - http://textometrie.ens-lyon.fr
+//
+//This file is part of the TXM platform.
+//
+//The TXM platform is free software: you can redistribute it and/or modif y
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+//
+//The TXM platform is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+//
+//You should have received a copy of the GNU General Public License
+//along with the TXM platform.  If not, see <http://www.gnu.org/licenses/>.
+//
+//
+//
+//$LastChangedDate: 2012-06-01 17:47:31 +0200 (ven., 01 juin 2012) $
+//$LastChangedRevision: 2185 $
+//$LastChangedBy: mdecorde $
+//
+
+import org.txm.importer.*;
+import org.xml.sax.Attributes;
+import org.txm.importer.filters.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.stream.*;
+import java.net.URL;
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.DefaultHandler;
+
+/** Build WTC corpus simple edition from a WTC file. 
+ * 
+ * @author mdecorde
+ */
+class pager {
+	List<String> NoSpaceBefore;
+
+	/** The No space after. */
+	List<String> NoSpaceAfter;
+
+	/** The wordcount. */
+	int wordcount = 0;
+
+	/** The pagecount. */
+	int pagecount = 0;
+
+	/** The wordmax. */
+	int wordmax = 0;
+
+	/** The basename. */
+	String basename = "";
+	String txtname = "";
+	File outdir;
+
+	/** The wordid. */
+	String wordid;
+
+	/** The first word. */
+	boolean firstWord = true;
+
+	/** The wordvalue. */
+	String wordvalue;
+
+	/** The interpvalue. */
+	String interpvalue;
+
+	/** The lastword. */
+	String lastword = " ";
+
+	/** The wordtype. */
+	String wordtype;
+
+	/** The flagform. */
+	boolean flagform = false;
+
+	/** The flaginterp. */
+	boolean flaginterp = false;
+
+	/** The url. */
+	private def url;
+
+	/** The input data. */
+	private def inputData;
+
+	/** The factory. */
+	private def factory;
+
+	/** The parser. */
+	private XMLStreamReader parser;
+
+	/** The writer. */
+	OutputStreamWriter writer;
+
+	/** The pagedWriter. */
+	OutputStreamWriter pagedWriter = null;
+
+	/** The cqpFile. */
+	File cqpFile;
+
+	/** The outfile. */
+	File outfile;
+
+	/** The pages. */
+	def pages = [:];
+
+	/** The idxstart. */
+	def idxstart = [:]
+	String editionPage;
+	ArrayList<Integer> splitTUs; // contains the tu ids used to split pages
+	boolean shouldSplit = false;
+	boolean useSplitTUs = false;
+	boolean hasWordId = false;
+	int noWordIdProperty = -1;
+	/**
+	 * Instantiates a new pager.
+	 *
+	 * @param cqpFile the cqpFile
+	 * @param outfile the outfile
+	 * @param NoSpaceBefore the no space before
+	 * @param NoSpaceAfter the no space after
+	 * @param max the max
+	 * @param basename the basename
+	 */
+	pager(File cqpFile, File outdir, List<String> NoSpaceBefore,
+	List<String> NoSpaceAfter, int max, String basename, boolean hasWordId, List pAttrs) {
+		this.editionPage = editionPage;
+		this.basename = basename;
+		this.txtname = "text1";
+		this.outdir = outdir;
+		this.wordmax = max;
+		this.NoSpaceBefore = NoSpaceBefore;
+		this.NoSpaceAfter = NoSpaceAfter;
+		this.cqpFile = cqpFile;
+		this.hasWordId = hasWordId;
+		if (hasWordId) {
+			noWordIdProperty = pAttrs.indexOf("id") + 1;
+			if (noWordIdProperty == 0)
+			hasWordId = false;
+		}
+		
+		process();
+	}
+
+	private void closeMultiWriter()
+	{
+		if (pagedWriter != null) {
+			if (firstWord) { // there was no words
+				this.idxstart[txtname] = ["w_0"]
+				pagedWriter.write("<span id=\"w_0\"/>");
+			}
+			pagedWriter.write("</p>\n")
+			pagedWriter.write("</body>");
+			pagedWriter.write("</html>");
+			pagedWriter.close();
+		}
+	}
+
+	/**
+	 * Creates the next output.
+	 *
+	 * @return true, if successful
+	 */
+	private boolean createNextOutput()
+	{
+		wordcount = 0;
+		shouldSplit = false;
+		try {
+			closeMultiWriter();
+			File outfile = new File(outdir, txtname+"_"+(++pagecount)+".html")
+			//println "outfile: "+outfile
+			if (pages[txtname] == null) pages[txtname] = []
+			pages[txtname] << outfile;
+			firstWord = true; // waiting for next word
+
+			pagedWriter = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(outfile)) , "UTF-8");
+			pagedWriter.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+			pagedWriter.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"   \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")
+			pagedWriter.write("<html>");
+			pagedWriter.write("<head>");
+			pagedWriter.write("<title>"+basename.toUpperCase()+" $txtname Edition - Page "+pagecount+"</title>");
+			pagedWriter.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"tmx.css\"/>");
+			pagedWriter.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"/>");
+			pagedWriter.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>");
+			pagedWriter.write("</head>");
+			pagedWriter.write("<body>");
+
+			return true;
+		} catch (Exception e) {
+			System.out.println(e.getLocalizedMessage());
+			return false;
+		}
+	}
+
+	/**
+	 * Creates the output.
+	 *
+	 * @param outfile the outfile
+	 * @return true, if successful
+	 */
+	private boolean createOutput() {
+		try {
+			return createNextOutput();
+		} catch (Exception e) {
+			System.out.println(e.getLocalizedMessage());
+			return false;
+		}
+	}
+
+	/**
+	 * Gets the page files.
+	 *
+	 * @return the page files
+	 */
+	public def getPageFiles() {
+		return pages;
+	}
+
+	/**
+	 * Gets the idx.
+	 *
+	 * @return the idx
+	 */
+	public def getIdx() {
+		return idxstart;
+	}
+
+	def texts = []
+
+	/**
+	 * Process.
+	 */
+	void process() {
+
+		String localname = "";
+		String lastword= "";
+		createNextOutput();
+		int wcounter = 1;
+		int txtwcounter = 1;
+
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(cqpFile) , "UTF-8"));
+		String line = reader.readLine();
+		int cline = 0;
+		while (line != null) {
+			pagedWriter.flush();
+			cline++;
+			//println "line: "+line
+			if (line.startsWith("<")) {
+				if (line.startsWith("<lb/") || line.startsWith("<br/") || line.startsWith("</p>") || 
+					line.startsWith("<lb>") || line.startsWith("<br>")) {
+					pagedWriter.write("<br/>");
+				} 
+				if (line.startsWith("<text>") || line.startsWith("<text ")) {
+					String tmp = line;
+					int idx = tmp.indexOf("id=\"");
+					if (idx > 0) {
+						tmp = tmp.substring(idx+4);
+						//println "tmp1: "+tmp
+						int idx2 = tmp.indexOf("\"");
+						//println "tmp2: "+tmp
+						if (idx2 > 0) {
+							tmp = tmp.substring(0, idx2);
+							txtname = tmp
+							texts << txtname;
+							pagecount = 0;
+							createNextOutput();
+						}
+					}
+				} else if (line.startsWith("<s>") || line.startsWith("<s ")) {
+					pagedWriter.write(line.replaceAll("<s", "<sent "));
+				} else if (line.startsWith("</s>")) {
+					pagedWriter.write("</sent>");
+				}  else if (line.startsWith("<pb/>") || line.startsWith("<pb>")) {
+					pagedWriter.write(line);
+					txtwcounter = 1;
+					createNextOutput();
+				} else {
+					pagedWriter.write(line);
+				}
+			} else { // word
+				if (txtwcounter > wordmax) {
+					txtwcounter = 1;
+					createNextOutput();
+				}
+				def split = line.split("\t");
+				if (split == null || split.size() == 0) {
+					// empty line
+				} else {
+					String wordid;
+					if (hasWordId) {
+						if (split.size() <= noWordIdProperty) { // +1 since line contains word
+							println "Error: line $cline"
+						} else {
+							wordid = split[noWordIdProperty];
+						}
+					} else {
+						wordid = "w_"+(wcounter++);
+					}
+					txtwcounter++;
+					String wordvalue = split[0];
+
+					if (firstWord) {
+						firstWord = false;
+						if (this.idxstart[txtname] == null) {
+							this.idxstart[txtname] = []
+						}
+						this.idxstart[txtname] << [wordid];
+					}
+
+					int l = lastword.length();
+					String endOfLastWord = "";
+					if (l > 0) {
+						endOfLastWord = lastword.subSequence(l-1, l);
+					}
+
+					String interpvalue = "";
+					if (split.size() > 1) {
+						interpvalue = split[1..split.size()-1].join(" ")
+						interpvalue = interpvalue.replace("&", "&amp;").replace("<", "&lt;").replace("\"","&quot;");
+					}
+
+
+					if (NoSpaceBefore.contains(wordvalue) ||
+					NoSpaceAfter.contains(lastword) ||
+					wordvalue.startsWith("-") ||
+					NoSpaceAfter.contains(endOfLastWord)) {
+						pagedWriter.write("<span title=\""+interpvalue+"\" id=\""+wordid+"\">");
+					} else {
+						pagedWriter.write(" <span title=\""+interpvalue+"\" id=\""+wordid+"\">");
+					}
+
+					pagedWriter.write(wordvalue.replace("&", "&amp;").replace("\"","&quot;").replace("<", "&lt;")+"</span>\n");
+					pagedWriter.flush()
+					lastword = wordvalue;
+				}
+			}
+			line = reader.readLine();
+		}
+
+		closeMultiWriter();
+	}
+
+	def getTextNames() {
+		return texts;
+	}
+}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/corptef/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/corptef/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/corptef/compiler.groovy	(revision 803)
@@ -160,7 +160,7 @@
 	}
 
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -515,9 +515,9 @@
 			println ("binary directory does not exists: "+rootDir)
 			return false;
 		}
-		new File(rootDir+"/wtc/","corptef.wtc").delete();//cleaning&preparing
-		new File(rootDir,"/wtc/").deleteDir();
-		new File(rootDir,"/wtc/").mkdir();
+		new File(rootDir+"/cqp/","corptef.cqp").delete();//cleaning&preparing
+		new File(rootDir,"/cqp/").deleteDir();
+		new File(rootDir,"/cqp/").mkdir();
 		new File(rootDir,"/data/").deleteDir();
 		new File(rootDir,"/data/").mkdir();
 		new File(rootDir,"registry/").mkdir();
@@ -540,7 +540,7 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				def builder = new compiler(f.toURL(),txtname, "corptef", "default");
 				builder.setLang lang
-				builder.transfomFileWtc(rootDir+"/wtc","corptef.wtc");
+				builder.transfomFileWtc(rootDir+"/cqp","corptef.cqp");
 			}
 		}
 
@@ -557,7 +557,7 @@
 			String regPath = new File(outDir , "registry/corptef").getAbsolutePath();
 			cwbEn.run(
 					new File(outDir, "/data").getAbsolutePath(),
-					new File(outDir, "wtc/"+"corptef.wtc").getAbsolutePath(),
+					new File(outDir, "cqp/"+"corptef.cqp").getAbsolutePath(),
 					regPath,
 					pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
@@ -568,7 +568,7 @@
 					"CORPTEF",
 					new File(outDir, "registry").getAbsolutePath());
 		} catch (Exception ex) {System.out.println(ex); return false;}
-		// "C:\Documents and Settings\alavrent\TXM\cwb\bin\cwb-encode" -d "C:\Documents and Settings\alavrent\TXM\corpora\corptef\data" -f "C:\Documents and Settings\alavrent\TXM\corpora\corptef\wtc\corpte.wtc" -R "C:\Documents and Settings\alavrent\TXM\corpora\corptef\registry\corptef" -c utf8 -xsB -xsB -P ttpos -P ttlemme -P id -P pb -P lb -P orig -P sic -P abbr -S text:0+id+titre+auteur+datecompo+ssiecle+domaine+genre+forme+dialecte+base+project -S front:0+n -S body:0+n -S ab:0+n+rend -S div:0+id+type -S p:0+n -S back:0+n
+		// "C:\Documents and Settings\alavrent\TXM\cwb\bin\cwb-encode" -d "C:\Documents and Settings\alavrent\TXM\corpora\corptef\data" -f "C:\Documents and Settings\alavrent\TXM\corpora\corptef\cqp\corpte.cqp" -R "C:\Documents and Settings\alavrent\TXM\corpora\corptef\registry\corptef" -c utf8 -xsB -xsB -P ttpos -P ttlemme -P id -P pb -P lb -P orig -P sic -P abbr -S text:0+id+titre+auteur+datecompo+ssiecle+domaine+genre+forme+dialecte+base+project -S front:0+n -S body:0+n -S ab:0+n+rend -S div:0+id+type -S p:0+n -S back:0+n
 		System.out.println("Done.")
 
 		return true;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/transcriber/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/transcriber/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/transcriber/compiler.groovy	(revision 803)
@@ -131,22 +131,22 @@
 
 		sectionAttrs = new HashSet<String>() // reset section attributs set
 
-		File wtcDir = new File(binDir, "wtc")
-		new File(binDir, "wtc").delete();
-		wtcDir.mkdir();
-		if (!new File(binDir, "wtc").exists()) {
-			println "Can't create wtc directory"
+		File cqpDir = new File(binDir, "cqp")
+		new File(binDir, "cqp").delete();
+		cqpDir.mkdir();
+		if (!new File(binDir, "cqp").exists()) {
+			println "Can't create cqp directory"
 			return false;
 		}
 
-		File wtcFile = new File(wtcDir, corpusname.toLowerCase()+".wtc")
+		File cqpFile = new File(cqpDir, corpusname.toLowerCase()+".cqp")
 
 		// get all anatypes
 		for (File f : xmlfiles) {
 			getAnaTypes(f)
 		}
 		//println "ANATYPES: "+anatypes
-		if (!createOutput(wtcFile)) return false;
+		if (!createOutput(cqpFile)) return false;
 		output.write("<txmcorpus lang=\"fr\">\n")
 		output.close();
 
@@ -158,7 +158,7 @@
 				}
 		}
 
-		if (!createOutput(wtcFile)) return false;
+		if (!createOutput(cqpFile)) return false;
 		output.write("</txmcorpus>\n")
 		output.close();
 
@@ -216,7 +216,7 @@
 		//return;
 		try {
 			cwbEn.run(dataDir.getAbsolutePath(),
-					wtcFile.getAbsolutePath(),
+					cqpFile.getAbsolutePath(),
 					registryFile.getAbsolutePath(), pAttributes, sAttributes);
 			if (!registryFile.exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
@@ -311,7 +311,7 @@
 		String filename = xmlfile.getName()
 		String textid = filename.substring(0, filename.length() - 4);
 
-		createOutput(new File(outdir, "wtc/"+corpusname.toLowerCase()+".wtc"));
+		createOutput(new File(outdir, "cqp/"+corpusname.toLowerCase()+".cqp"));
 		String localname;
 
 		//get all metadatas declared before Episode tag
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/alceste/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/alceste/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/alceste/compiler.groovy	(revision 803)
@@ -47,7 +47,7 @@
 
 // TODO: Auto-generated Javadoc
 /**
- * build wtc
+ * build cqp
  * build CWB indexes
  * create registry file.
  *
@@ -184,9 +184,9 @@
 			println ("binary directory does not exists: "+binDir)
 			return false;
 		}
-		File wtcFile = new File(binDir,"wtc/"+corpusname+".wtc");
-		new File(binDir, "wtc").deleteDir();
-		new File(binDir, "wtc").mkdir();
+		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
+		new File(binDir, "cqp").deleteDir();
+		new File(binDir, "cqp").mkdir();
 		new File(binDir, "data/$corpusname").deleteDir();
 		new File(binDir, "data/$corpusname").mkdir();
 		new File(binDir, "registry").mkdir();
@@ -200,14 +200,14 @@
 		}
 		
 		//start corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
 			output.close();
 		}
 		
 		Collections.sort(files);
 		//1- Transform into WTC file
-		XMLTXM2WTC wtcbuilder = null;
+		XMLTXM2WTC cqpbuilder = null;
 		println("process "+files.size()+" files")
 		for (File f : files) {
 			print "."
@@ -215,14 +215,14 @@
 			if (!f.exists()) {
 				println("file "+f+ " does not exists")	
 			} else {			
-				wtcbuilder = new XMLTXM2WTC(f.toURI().toURL());
+				cqpbuilder = new XMLTXM2WTC(f.toURI().toURL());
 				String txtname = f.getName().substring(0, f.getName().length()-4);
-				wtcbuilder.setTextInfo(txtname, corpusname, "default");
+				cqpbuilder.setTextInfo(txtname, corpusname, "default");
 
-				wtcbuilder.setBalisesToKeep(["text", "s", "p", "lb"]);
-				wtcbuilder.setSendToPAttributes(["lb":["n"], "p":["n"], "s":["n"]])
-				wtcbuilder.setLang(lang);
-				if (!wtcbuilder.transformFile(wtcFile)) {
+				cqpbuilder.setBalisesToKeep(["text", "s", "p", "lb"]);
+				cqpbuilder.setSendToPAttributes(["lb":["n"], "p":["n"], "s":["n"]])
+				cqpbuilder.setLang(lang);
+				if (!cqpbuilder.transformFile(cqpFile)) {
 					println("Failed to compile "+f)
 				}
 			}
@@ -230,12 +230,12 @@
 		println ""
 		
 		//end corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("</txmcorpus>\n");
 			output.close();
 		}
 		
-		if (wtcbuilder == null) {
+		if (cqpbuilder == null) {
 			println "there was no files in bin dir : "+txmDir
 			return false;
 		}
@@ -247,8 +247,8 @@
 		CwbMakeAll cwbMa = new CwbMakeAll();
 		cwbMa.setDebug(debug);
 		
-		List<String> pAttributesList = wtcbuilder.getpAttributs();
-		List<String> sAttributesList = wtcbuilder.getsAttributs();
+		List<String> pAttributesList = cqpbuilder.getpAttributs();
+		List<String> sAttributesList = cqpbuilder.getsAttributs();
 		println "pAttrs : "+pAttributesList
 		println "sAttrs : "+sAttributesList
 		String[] pAttributes = pAttributesList.toArray(new String[pAttributesList.size()])
@@ -256,7 +256,7 @@
 		
 		try {
 			String regPath = rootDir + "/registry/"+corpusname.toLowerCase(); // CQP wants lowercase registry name
-			cwbEn.run(rootDir + "/data/${corpusname}", rootDir + "/wtc/"+corpusname+".wtc", regPath,pAttributes, sAttributes);
+			cwbEn.run(rootDir + "/data/${corpusname}", rootDir + "/cqp/"+corpusname+".cqp", regPath,pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xmltxm/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xmltxm/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/xmltxm/compiler.groovy	(revision 803)
@@ -176,15 +176,15 @@
 	}
 
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
 	 * @return true, if successful
 	 */
-	public boolean transfomFileWtc(File wtcFile)
+	public boolean transfomFileWtc(File cqpFile)
 	{
-		createOutput(wtcFile);
+		createOutput(cqpFile);
 		String headvalue=""
 		String vAna = "";
 		String vForm = "";
@@ -356,9 +356,9 @@
 			return false;
 		}
 
-		File wtcFile = new File(binDir,"wtc/"+corpusname.toLowerCase()+".wtc");
-		new File(rootDir,"/wtc/").deleteDir();
-		new File(rootDir,"/wtc/").mkdir();
+		File cqpFile = new File(binDir,"cqp/"+corpusname.toLowerCase()+".cqp");
+		new File(rootDir,"/cqp/").deleteDir();
+		new File(rootDir,"/cqp/").mkdir();
 		new File(rootDir,"data/"+corpusname).deleteDir();
 		new File(rootDir,"data/"+corpusname).mkdir();
 		new File(rootDir,"registry/").mkdir();
@@ -373,7 +373,7 @@
 		}
 
 		//0 set Lang
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
 			output.close();
 		}
@@ -388,13 +388,13 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				builder = new compiler(f.toURI().toURL(), txtname, corpusname.toLowerCase(), "default");
 				builder.setLang(lang);
-				if(!builder.transfomFileWtc(wtcFile))
+				if(!builder.transfomFileWtc(cqpFile))
 					return false;
 			}
 		}
 
 		//end corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("</txmcorpus>\n");
 			output.close();
 		}
@@ -448,7 +448,7 @@
 			String regPath = rootDir + "/registry/"+corpusname.toLowerCase() 
 			cwbEn.run(
 				rootDir + "/data/$corpusname", 
-				wtcFile.getAbsolutePath(), 
+				cqpFile.getAbsolutePath(), 
 				regPath, pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/fleurs/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/fleurs/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/fleurs/compiler.groovy	(revision 803)
@@ -140,7 +140,7 @@
 	}
 		
 	/**
-	 * Transfom file wtc.
+	 * Transfom file cqp.
 	 *
 	 * @param dirPathName the dir path name
 	 * @param fileName the file name
@@ -240,9 +240,9 @@
 			println ("Error: CWB executables not well set.")
 			return false;
 		}
-		new File(rootDir,"wtc/fleurs.wtc").delete();//cleaning&preparing
-		new File(rootDir,"wtc/").deleteDir();
-		new File(rootDir,"wtc/").mkdir();
+		new File(rootDir,"cqp/fleurs.cqp").delete();//cleaning&preparing
+		new File(rootDir,"cqp/").deleteDir();
+		new File(rootDir,"cqp/").mkdir();
 		new File(rootDir,"registry/").mkdir();
 		
 		//1- Transform into WTC file
@@ -257,7 +257,7 @@
 				String txtname = f.getName().substring(0,f.getName().length()-4);
 				def builder = new compiler(f.toURL(), txtname, "fleurs", "default");
 				builder.setLang lang
-				builder.transfomFileWtc(rootDir,"wtc/fleurs.wtc");
+				builder.transfomFileWtc(rootDir,"cqp/fleurs.cqp");
 			}
 		}
 		
@@ -275,7 +275,7 @@
 		
 		try {
 			String regPath = outDirTxm + "/registry/"+"fleurs"
-			cwbEn.run(outDirTxm + "data", outDir + "/wtc/"+"fleurs.wtc", regPath,pAttributes, sAttributes);
+			cwbEn.run(outDirTxm + "data", outDir + "/cqp/"+"fleurs.cqp", regPath,pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/XMLTXM2WTC.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/XMLTXM2WTC.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/XMLTXM2WTC.groovy	(revision 803)
@@ -41,7 +41,7 @@
  * The Class XMLTXM2WTC.
  *
  * @author mdecorde
- * simple transofmration of a xml-tei-txm file into wtc file
+ * simple transofmration of a xml-tei-txm file into cqp file
  */
 
 class XMLTXM2WTC
@@ -115,7 +115,7 @@
 	}
 	
 	/**
-	 * Instantiates a new xMLTX m2 wtc.
+	 * Instantiates a new xMLTX m2 cqp.
 	 *
 	 * @param url the url
 	 */
@@ -490,15 +490,15 @@
 		
 		File srcfile = new File(rootDir,"CORNEILLEP_AGESILAS_1666.xml");
 		println srcfile.exists()
-		File wtcfile = new File(rootDir, "out/CORNEILLEP_AGESILAS_1666.wtc");
+		File cqpfile = new File(rootDir, "out/CORNEILLEP_AGESILAS_1666.cqp");
 		new File(rootDir,"out").deleteDir()
 		new File(rootDir,"out").mkdir()
 		
-		System.out.println("XMLTXM2WTC : "+srcfile+" >> "+wtcfile);
+		System.out.println("XMLTXM2WTC : "+srcfile+" >> "+cqpfile);
 		def builder = new XMLTXM2WTC(srcfile.toURL());
 		def balises = ["text", "s"];
 		builder.setBalisesToKeep(balises);
-		builder.transformFile(wtcfile);
+		builder.transformFile(cqpfile);
 		
 		println("SATTRIBUTS: "+builder.getsAttributs());
 		println("PATTRIBUTS: "+builder.getpAttributs());
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/importer.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/importer.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/importer.groovy	(revision 803)
@@ -128,7 +128,7 @@
 			int idx = filename.lastIndexOf(".");
 			if (idx > 0) filename = filename.substring(0, idx)
 
-			File outfile = new File(txmDir, filename+".wtc")
+			File outfile = new File(txmDir, filename+".cqp")
 			
 			if (outfile.exists() && outfile.lastModified() >= infile.lastModified()) {
 				// skip
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/LimsiToCQP.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/LimsiToCQP.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/LimsiToCQP.groovy	(revision 803)
@@ -16,7 +16,7 @@
 		
 		URL url = xmlfile.toURI().toURL();
 		String filename = outfile.getName()
-		filename = filename.substring(0, filename.length()-4); // remove ".wtc"
+		filename = filename.substring(0, filename.length()-4); // remove ".cqp"
 		def inputData = url.openStream();
 		XMLInputFactory factory = XMLInputFactory.newInstance();
 		XMLStreamReader parser = factory.createXMLStreamReader(inputData);
@@ -71,7 +71,7 @@
 
 	public static void main(String[] args) {
 		File infile = new File("/home/mdecorde/xml/limsi","20071220_1900_1920_inter.xml")
-		File outfile = new File("/home/mdecorde/xml/limsi","out.wtc")
+		File outfile = new File("/home/mdecorde/xml/limsi","out.cqp")
 		def processor = new LimsiToCQP(infile);
 		println processor.process(outfile);
 	}
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/limsi/compiler.groovy	(revision 803)
@@ -99,9 +99,9 @@
 			return false
 		}
 
-		//File wtcFile = new File(binDir,"wtc/"+corpusname+".wtc")
-		new File(binDir, "wtc").deleteDir()
-		new File(binDir, "wtc").mkdir()
+		//File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp")
+		new File(binDir, "cqp").deleteDir()
+		new File(binDir, "cqp").mkdir()
 		new File(binDir, "data").deleteDir()
 		new File(binDir, "data").mkdir()
 		new File(binDir, "registry").mkdir()
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/txt/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/txt/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/txt/compiler.groovy	(revision 803)
@@ -183,9 +183,9 @@
 			return false;
 		}
 		
-		File wtcFile = new File(binDir,"wtc/"+corpusname+".wtc");
-		new File(binDir, "wtc").deleteDir();
-		new File(binDir, "wtc").mkdir();
+		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
+		new File(binDir, "cqp").deleteDir();
+		new File(binDir, "cqp").mkdir();
 		new File(binDir, "data").deleteDir();
 		new File(binDir, "data").mkdir();
 		new File(binDir, "registry").mkdir();
@@ -194,36 +194,36 @@
 		int counttext =0;
 		
 		//start corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
 			output.close();
 		}
 		
 		//1- Transform into WTC file
 		println("Compiling "+txmDir.listFiles().length+" files")
-		XMLTXM2WTC wtcbuilder = null;
+		XMLTXM2WTC cqpbuilder = null;
 		ArrayList<File> files = txmDir.listFiles();
 		Collections.sort(files);
 		for (File txmfile : files) {
 			print "."
-			wtcbuilder = new XMLTXM2WTC(txmfile.toURI().toURL());
+			cqpbuilder = new XMLTXM2WTC(txmfile.toURI().toURL());
 			String txtname = txmfile.getName().substring(0,txmfile.getName().length()-4);
-			wtcbuilder.setTextInfo(txtname, this.base, this.project);
+			cqpbuilder.setTextInfo(txtname, this.base, this.project);
 
-			wtcbuilder.setBalisesToKeep(["text","s"]);
-			wtcbuilder.setSendToPAttributes(["lb":["n"]]);
-			wtcbuilder.setLang(lang);
-			if (!wtcbuilder.transformFile(wtcFile)) {
+			cqpbuilder.setBalisesToKeep(["text","s"]);
+			cqpbuilder.setSendToPAttributes(["lb":["n"]]);
+			cqpbuilder.setLang(lang);
+			if (!cqpbuilder.transformFile(cqpFile)) {
 				println("Failed to compile "+txmfile)
 			}
 			
-//			println "$txmfile pAttrs : "+wtcbuilder.getpAttributs()
-//			println "$txmfile sAttrs : "+wtcbuilder.getsAttributs()
+//			println "$txmfile pAttrs : "+cqpbuilder.getpAttributs()
+//			println "$txmfile sAttrs : "+cqpbuilder.getsAttributs()
 		}
 		println ""
 		
 		//end corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("</txmcorpus>\n");
 			output.close();
 		}
@@ -236,11 +236,11 @@
 		cwbEn.setDebug(debug);
 		cwbMa.setDebug(debug);
 		
-		if(wtcbuilder == null)
+		if(cqpbuilder == null)
 			return false;
 		
-		List<String> pAttributesList = wtcbuilder.getpAttributs(); // use last text s and p attributes
-		List<String> sAttributesList = wtcbuilder.getsAttributs();
+		List<String> pAttributesList = cqpbuilder.getpAttributs(); // use last text s and p attributes
+		List<String> sAttributesList = cqpbuilder.getsAttributs();
 		println "pAttrs : "+pAttributesList
 		println "sAttrs : "+sAttributesList
 		String[] pAttributes = pAttributesList.toArray(new String[pAttributesList.size()])
@@ -248,7 +248,7 @@
 		
 		try {
 			String regPath = outDir + "/registry/"+corpusname.toLowerCase();
-			cwbEn.run(outDir + "/data/$corpusname", outDir + "/wtc/"+corpusname+".wtc", regPath, pAttributes, sAttributes);
+			cwbEn.run(outDir + "/data/$corpusname", outDir + "/cqp/"+corpusname+".cqp", regPath, pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/importer/hyperbase/compiler.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/importer/hyperbase/compiler.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/importer/hyperbase/compiler.groovy	(revision 803)
@@ -195,15 +195,15 @@
 			println ("binary directory does not exists: "+rootDir)
 			return false;
 		}
-		File wtcFile = new File(binDir,"wtc/"+corpusname+".wtc");
-		new File(binDir,"wtc").deleteDir();
-		new File(binDir,"wtc").mkdir();
+		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
+		new File(binDir,"cqp").deleteDir();
+		new File(binDir,"cqp").mkdir();
 		new File(binDir,"data").deleteDir();
 		new File(binDir,"data").mkdir();
 		new File(binDir,"registry").mkdir();
 		
 		//start corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("<txmcorpus lang=\""+lang+"\">\n");
 			output.close();
 		}
@@ -213,7 +213,7 @@
 		List<File> files = txmDir.listFiles();
 		Collections.sort(files);
 		//1- Transform into WTC file
-		XMLTXM2WTC wtcbuilder = null;
+		XMLTXM2WTC cqpbuilder = null;
 		println("Compiling "+files.size()+" files")
 		for (File f : files) {
 			print "."
@@ -222,14 +222,14 @@
 				println("file "+f+ " does not exists")	
 			}
 			else {	
-				wtcbuilder = new XMLTXM2WTC(f.toURI().toURL());
+				cqpbuilder = new XMLTXM2WTC(f.toURI().toURL());
 				String txtname = f.getName().substring(0,f.getName().length()-4);
-				wtcbuilder.setTextInfo(txtname, corpusname, "project");
+				cqpbuilder.setTextInfo(txtname, corpusname, "project");
 
-				wtcbuilder.setBalisesToKeep(["text","p","s"]);
-				wtcbuilder.setSendToPAttributes(["s":["n"]]);
-				wtcbuilder.setLang(lang);
-				if (!wtcbuilder.transformFile(wtcFile)) {
+				cqpbuilder.setBalisesToKeep(["text","p","s"]);
+				cqpbuilder.setSendToPAttributes(["s":["n"]]);
+				cqpbuilder.setLang(lang);
+				if (!cqpbuilder.transformFile(cqpFile)) {
 					println("Failed to compile "+f)
 				}
 			}
@@ -237,12 +237,12 @@
 		println ""
 		
 		//end corpus
-		if (createOutput(wtcFile)) {
+		if (createOutput(cqpFile)) {
 			output.write("</txmcorpus>\n");
 			output.close();
 		}
 		
-		if (wtcbuilder == null) return false;
+		if (cqpbuilder == null) return false;
 		
 		//2- Import into CWB
 		def outDir =rootDir;
@@ -252,8 +252,8 @@
 		CwbMakeAll cwbMa = new CwbMakeAll();
 		cwbMa.setDebug(debug);
 		
-		List<String> pAttributesList = wtcbuilder.getpAttributs();
-		List<String> sAttributesList = wtcbuilder.getsAttributs();
+		List<String> pAttributesList = cqpbuilder.getpAttributs();
+		List<String> sAttributesList = cqpbuilder.getsAttributs();
 		println "word properties : "+pAttributesList
 		println "structures : "+sAttributesList
 		String[] pAttributes = pAttributesList.toArray(new String[pAttributesList.size()])
@@ -261,7 +261,7 @@
 		
 		try {
 			String regPath = outDir + "/registry/"+corpusname.toLowerCase();
-			cwbEn.run(outDir + "/data/$corpusname", outDir + "/wtc/"+corpusname+".wtc", regPath,pAttributes, sAttributes);
+			cwbEn.run(outDir + "/data/$corpusname", outDir + "/cqp/"+corpusname+".cqp", regPath,pAttributes, sAttributes);
 			if (!new File(regPath).exists()) {
 				println "Error: The registry file was not created: $regPath. See https://groupes.renater.fr/wiki/txm-users/public/faq"
 				return false;
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/macroproto/RunImportMacro.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/macroproto/RunImportMacro.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/macroproto/RunImportMacro.groovy	(revision 803)
@@ -39,7 +39,7 @@
 scripts["CNRCSV"] = "discoursLoader.groovy"
 scripts["HYPERBASE"] = "hyperbaseLoader.groovy"
 scripts["ALCESTE"] = "alcesteLoader.groovy"
-scripts["CWB"] = "wtcLoader.groovy"
+scripts["CWB"] = "cqpLoader.groovy"
 scripts["DOC"] = "docLoader.groovy"
 
 def scriptName = scripts.get(importName)
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/testTT.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/testTT.groovy	(revision 802)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/testTT.groovy	(revision 803)
@@ -78,7 +78,7 @@
 
 //Import to CWB
 BuildXmlRGAQCJ.process( anafiles,  rootDir)
-println("build wtc RGAQCJ");
+println("build cqp RGAQCJ");
 println("encode + makeall");
 
 //create TT TRAIN files
Index: tmp/org.txm.groovy.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 802)
+++ tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 803)
@@ -68,6 +68,7 @@
  org.txm.importer.bfm,
  org.txm.importer.bvh,
  org.txm.importer.corptef,
+ org.txm.importer.cqp,
  org.txm.importer.discours,
  org.txm.importer.doc,
  org.txm.importer.factiva,
@@ -83,7 +84,6 @@
  org.txm.importer.tmx,
  org.txm.importer.transcriber,
  org.txm.importer.txt,
- org.txm.importer.wtc,
  org.txm.importer.xml,
  org.txm.importer.xmltxm,
  org.txm.importer.xmltxmpara,
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportModuleCustomization.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportModuleCustomization.java	(revision 802)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportModuleCustomization.java	(revision 803)
@@ -65,8 +65,8 @@
 		params.put(UI, true);
 		params.put(TEXTUALPLANS, false);
 		params.put(OPTIONS, false);
-		allParams.put("wtcLoader.groovy", params); //$NON-NLS-1$
-		names.put("wtcLoader.groovy", "WTC"); //$NON-NLS-1$ //$NON-NLS-2$
+		allParams.put("cqpLoader.groovy", params); //$NON-NLS-1$
+		names.put("cqpLoader.groovy", "WTC"); //$NON-NLS-1$ //$NON-NLS-2$
 		
 		params = new HashMap<String, Boolean>();
 		params.put(PARALLEL, false);
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java	(revision 802)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java	(revision 803)
@@ -138,7 +138,7 @@
 				TreeSelection selection = (TreeSelection) tv.getSelection();
 				if (selection.getFirstElement() instanceof Corpus) {
 					Corpus corpus = (Corpus)selection.getFirstElement();
-					File selectedItem = new File(corpus.getBaseDirectory(), "wtc/"+corpus.getName()+".wtc");
+					File selectedItem = new File(corpus.getBaseDirectory(), "cqp/"+corpus.getName()+".cqp");
 					if (selectedItem.exists())
 						EditFile.openfile(selectedItem.getAbsolutePath());
 				} else if (selection.getFirstElement() instanceof Text) {
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 802)
+++ tmp/org.txm.rcp/plugin.xml	(revision 803)
@@ -487,7 +487,7 @@
                      tooltip="%command.tooltip.25">
                   <parameter
                         name="org.txm.rcp.commands.commandParameter3"
-                        value="wtcLoader.groovy">
+                        value="cqpLoader.groovy">
                   </parameter>
                </command>
                <separator
