diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index 496165968e1c725c81229696bade2750823cfc73..b87e052a0746913ded019d4cf7f6cd1f48a2cf59 100755
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -2833,8 +2833,8 @@ public class GTMLModeling  {
                     ce.setTGComponent(firewallnode);
                     checkingErrors.add(ce);
                 } else {
-                    names.add("CPU__"+firewallnode.getName());
-                    bridge = new HwBridge("CPU__"+firewallnode.getName());
+                    names.add(firewallnode.getName());
+                    bridge = new HwBridge(firewallnode.getName());
                     bridge.isFirewall=true;
                     bridge.firewallRules = ((TMLArchiFirewallNode) tgc).getRules();
                     bridge.latency = ((TMLArchiFirewallNode) tgc).getLatency();
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index a2ce87c29a076e931a111d980baef0651d919af4..7e9868b6490cba5d00bd830063f17f04c590bf29 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -740,7 +740,7 @@ public class GTURTLEModeling {
     }
 
     public TMLMapping<TGComponent> drawFirewall(TMLMapping<TGComponent> map) {
-        System.out.println("DRAWING FIREWALL");
+      //  System.out.println("DRAWING FIREWALL");
         TGComponent comp = map.getTMLModeling().getTGComponent();
         TMLComponentDesignPanel tmlcdp = (TMLComponentDesignPanel) comp.getTDiagramPanel().tp;
         // TMLComponentDesignPanel tmlcdp = map.getTMLCDesignPanel();
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index afba76dcd7f9d49a81e9fbdcca4f71cece332368..4a624712ed22f1dfe36424205671b3d007a86268 100755
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -877,9 +877,9 @@ public class TGComponentManager {
         case PERFORMANCE_PRAGMA:
             tgc = new AvatarBDPerformancePragma(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
             break;
-            //        case AVATAR_FIREWALL:
-            //            tgc = new AvatarBDFirewall(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
-            //            break;
+        case AVATAR_FIREWALL:
+            tgc = new AvatarBDFirewall(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+            break;
         case IOD_CHOICE:
             tgc = new IODChoice(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
             break;
diff --git a/src/main/java/ui/tmldd/TMLArchiFirewallNode.java b/src/main/java/ui/tmldd/TMLArchiFirewallNode.java
index 01969f5aa02189a3febcae8d0c695fef700ed1a8..af33ff900df90590f4ccb26a7924947c6dc7c3b6 100644
--- a/src/main/java/ui/tmldd/TMLArchiFirewallNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiFirewallNode.java
@@ -60,7 +60,7 @@ import java.util.ArrayList;
  * @version 1.0 17/10/2016
  * @author Letitia LI
  */
-public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
+public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiSecurityInterface {
     private int textY1 = 15;
     private int textY2 = 30;
     private int derivationx = 2;
diff --git a/src/main/java/ui/tmldd/TMLArchiHWANode.java b/src/main/java/ui/tmldd/TMLArchiHWANode.java
index 5b37e8d8c8b9615ea5d94579190253b0663a2ffd..db4c42d69d0b34a46a2f1074d2448a641eb8544b 100755
--- a/src/main/java/ui/tmldd/TMLArchiHWANode.java
+++ b/src/main/java/ui/tmldd/TMLArchiHWANode.java
@@ -61,7 +61,7 @@ import java.util.Vector;
    * @version 1.0 23/11/2007
    * @author Ludovic APVRILLE
  */
-public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes {
+public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
     private int textY1 = 15;
     private int textY2 = 30;
     private int derivationx = 2;