diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index b7fbe4e556e6036e9a7608aa8a2005cdafd056ba..b415fdc722118f98363906b983a48b7c5c4fb379 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -9864,6 +9864,7 @@ public class GTURTLEModeling {
         for (AvatarDataType adt : avspec.getDataTypes()) {
             AvatarBDDataType abdType = new AvatarBDDataType(xpos, ypos, abd.getMinX(), abd.getMaxX(), abd.getMinY(), abd.getMaxY(), false,
                     null, abd);
+            abdType.setDataTypeName(adt.getName());
             // Adding attributes
             for (AvatarAttribute attr : adt.getAttributes()) {
                 int type = 4;
diff --git a/src/main/java/ui/avatarbd/AvatarBDDataType.java b/src/main/java/ui/avatarbd/AvatarBDDataType.java
index 5a29af61e32b1b4d053de34c93a07de945b7c83d..9010e702f355d6228a9e138279e15bb1f32e2925 100644
--- a/src/main/java/ui/avatarbd/AvatarBDDataType.java
+++ b/src/main/java/ui/avatarbd/AvatarBDDataType.java
@@ -328,6 +328,7 @@ public class AvatarBDDataType extends TGCScalableWithInternalComponent implement
                 }
 
                 setValue(s);
+                setName(s);
                 recalculateSize();
 
                 if (tdp.actionOnDoubleClick(this)) {
@@ -487,6 +488,11 @@ public class AvatarBDDataType extends TGCScalableWithInternalComponent implement
         return value;
     }
 
+    public void setDataTypeName(String _name) {
+        setName(_name);
+        setValue(_name);
+    }
+
     @Override
     public int getDefaultConnector() {
         return TGComponentManager.AVATARBD_PORT_CONNECTOR;