diff --git a/src/main/java/ui/eln/ELNCluster.java b/src/main/java/ui/eln/ELNCluster.java
index 2d318d82f5da6b0fdd432461be8b746a10326a62..af1acdd6df24a891e0a91262e26e96fa617c4fdd 100644
--- a/src/main/java/ui/eln/ELNCluster.java
+++ b/src/main/java/ui/eln/ELNCluster.java
@@ -87,7 +87,7 @@ public class ELNCluster extends TGCScalableWithInternalComponent implements Swal
 		removable = true;
 		userResizable = true;
 
-		value = tdp.findELNComponentName("Cluster");
+		value = "cluster";
 	}
 
 	public void internalDrawing(Graphics g) {
diff --git a/src/main/java/ui/eln/ELNModule.java b/src/main/java/ui/eln/ELNModule.java
index 2c69fd80c9b986435becc9f702eba5ea67ae4f52..0e39011ae48e83cbb46fe7d2948304d0e29c6458 100644
--- a/src/main/java/ui/eln/ELNModule.java
+++ b/src/main/java/ui/eln/ELNModule.java
@@ -90,7 +90,7 @@ public class ELNModule extends TGCScalableWithInternalComponent implements Swall
 		removable = true;
 		userResizable = true;
 
-		value = tdp.findELNComponentName("Module");
+		value = tdp.findELNComponentName("module");
 	}
 
 	public void internalDrawing(Graphics g) {
diff --git a/src/main/java/ui/syscams/SysCAMSBlockDE.java b/src/main/java/ui/syscams/SysCAMSBlockDE.java
index cabef17c3e73e14dfd3666282a58692b3b78068d..b88b13e3c82a19afa02a6584084c75cdf76bae9b 100644
--- a/src/main/java/ui/syscams/SysCAMSBlockDE.java
+++ b/src/main/java/ui/syscams/SysCAMSBlockDE.java
@@ -104,7 +104,7 @@ public class SysCAMSBlockDE extends TGCScalableWithInternalComponent implements
 		removable = true;
 		userResizable = true;
 
-		value = tdp.findSysCAMSPrimitiveComponentName("Block_DE_");
+		value = tdp.findSysCAMSPrimitiveComponentName("blockDE");
 		name = "Primitive component - Block DE";
 
 //		setPeriod(-1);
@@ -430,7 +430,6 @@ public class SysCAMSBlockDE extends TGCScalableWithInternalComponent implements
 			Node n1, n2;
 			Element elt;
 
-			int period;
 			String code, nameFn, listStruct, nameTemplate, typeTemplate, listTypedef;
 
 			for(int i=0; i<nl.getLength(); i++) {
diff --git a/src/main/java/ui/syscams/SysCAMSBlockGPIO2VCI.java b/src/main/java/ui/syscams/SysCAMSBlockGPIO2VCI.java
index 7541ca889e9aeda9703b9b0be66b20c814d79cf7..152947c73a371f6b56ddf1099565bf33c4b6044a 100644
--- a/src/main/java/ui/syscams/SysCAMSBlockGPIO2VCI.java
+++ b/src/main/java/ui/syscams/SysCAMSBlockGPIO2VCI.java
@@ -89,7 +89,7 @@ public class SysCAMSBlockGPIO2VCI extends TGCScalableWithInternalComponent imple
         removable = true;
         userResizable = true;
 
-    	value = "Block_GPIO2VCI";
+    	value = "blockGPIO2VCI";
         name = "Primitive component - Block GPIO2VCI";
         
         myImageIcon = IconManager.imgic1202;
diff --git a/src/main/java/ui/syscams/SysCAMSBlockTDF.java b/src/main/java/ui/syscams/SysCAMSBlockTDF.java
index 760a43bd4909d61b504653fba213cc3d4483b972..50dce72deb5030138248859db111c7d8b61e31a4 100644
--- a/src/main/java/ui/syscams/SysCAMSBlockTDF.java
+++ b/src/main/java/ui/syscams/SysCAMSBlockTDF.java
@@ -102,7 +102,7 @@ public class SysCAMSBlockTDF extends TGCScalableWithInternalComponent implements
 		removable = true;
 		userResizable = true;
 
-		value = tdp.findSysCAMSPrimitiveComponentName("Block_TDF_");
+		value = tdp.findSysCAMSPrimitiveComponentName("blockTDF");
 		oldValue = value;
 		name = "Primitive component - Block TDF";
 
diff --git a/src/main/java/ui/syscams/SysCAMSCompositeComponent.java b/src/main/java/ui/syscams/SysCAMSCompositeComponent.java
index b4715c23be17b14934c853c5863e53c085eb266d..7291cfafd470159d757649601770f32203d1d195 100644
--- a/src/main/java/ui/syscams/SysCAMSCompositeComponent.java
+++ b/src/main/java/ui/syscams/SysCAMSCompositeComponent.java
@@ -39,9 +39,6 @@
 package ui.syscams;
 
 import myutil.GraphicLib;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import ui.*;
 import ui.util.IconManager;