diff --git a/tools.descartes.dni.core/model/DNIMM3.xcore b/tools.descartes.dni.core/model/DNIMM3.xcore
index 27b37988d274ea0da8ef722f9fb7e26d12cf9d54..b138be7aaa8ced3e50a9e5db8260921b130ece21 100644
--- a/tools.descartes.dni.core/model/DNIMM3.xcore
+++ b/tools.descartes.dni.core/model/DNIMM3.xcore
@@ -102,7 +102,7 @@ class Link extends Entity {
 			connects.get(1).name === null) {
 			name = "Partially_connected_" + uid
 		} else {
-			name = "Link_" + connects.get(0).name + "<-->" + connects.get(1).name
+			name = "Link between " + connects.get(0).name + " and " + connects.get(1).name
 		}
 		return name
 	}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
index 6ad5a0fc776b9eb1b71d5a31f7739fb417cce5c3..6423b977223d85a5dee52e636d7fbe67e5f55136 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
@@ -77,7 +77,7 @@ public interface Link extends Entity {
 	 * @return the value of the '<em>Name generated</em>' attribute.
 	 * @see tools.descartes.dni.dnimm3.DNIPackage#getLink_Name_generated()
 	 * @model unique="false" transient="true" changeable="false" volatile="true" derived="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='int _size = this.getConnects().size();\nboolean _equals = (_size == 0);\nif (_equals)\n{\n\t&lt;%java.lang.String%&gt; _uid = this.getUid();\n\t&lt;%java.lang.String%&gt; _plus = (\"Unconnected_\" + _uid);\n\tthis.setName(_plus);\n}\nint _size_1 = this.getConnects().size();\nboolean _equals_1 = (_size_1 == 1);\nif (_equals_1)\n{\n\t&lt;%java.lang.String%&gt; _uid_1 = this.getUid();\n\t&lt;%java.lang.String%&gt; _plus_1 = (\"Partially_connected_\" + _uid_1);\n\tthis.setName(_plus_1);\n}\nelse\n{\n\tif (((((this.getConnects().get(0) == null) || (this.getConnects().get(0).getName() == null)) || (this.getConnects().get(1) == null)) || \n\t\t(this.getConnects().get(1).getName() == null)))\n\t{\n\t\t&lt;%java.lang.String%&gt; _uid_2 = this.getUid();\n\t\t&lt;%java.lang.String%&gt; _plus_2 = (\"Partially_connected_\" + _uid_2);\n\t\tthis.setName(_plus_2);\n\t}\n\telse\n\t{\n\t\t&lt;%java.lang.String%&gt; _name = this.getConnects().get(0).getName();\n\t\t&lt;%java.lang.String%&gt; _plus_3 = (\"Link_\" + _name);\n\t\t&lt;%java.lang.String%&gt; _plus_4 = (_plus_3 + \"&lt;--&gt;\");\n\t\t&lt;%java.lang.String%&gt; _name_1 = this.getConnects().get(1).getName();\n\t\t&lt;%java.lang.String%&gt; _plus_5 = (_plus_4 + _name_1);\n\t\tthis.setName(_plus_5);\n\t}\n}\nreturn this.getName();'"
+	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='int _size = this.getConnects().size();\nboolean _equals = (_size == 0);\nif (_equals)\n{\n\t&lt;%java.lang.String%&gt; _uid = this.getUid();\n\t&lt;%java.lang.String%&gt; _plus = (\"Unconnected_\" + _uid);\n\tthis.setName(_plus);\n}\nint _size_1 = this.getConnects().size();\nboolean _equals_1 = (_size_1 == 1);\nif (_equals_1)\n{\n\t&lt;%java.lang.String%&gt; _uid_1 = this.getUid();\n\t&lt;%java.lang.String%&gt; _plus_1 = (\"Partially_connected_\" + _uid_1);\n\tthis.setName(_plus_1);\n}\nelse\n{\n\tif (((((this.getConnects().get(0) == null) || (this.getConnects().get(0).getName() == null)) || (this.getConnects().get(1) == null)) || \n\t\t(this.getConnects().get(1).getName() == null)))\n\t{\n\t\t&lt;%java.lang.String%&gt; _uid_2 = this.getUid();\n\t\t&lt;%java.lang.String%&gt; _plus_2 = (\"Partially_connected_\" + _uid_2);\n\t\tthis.setName(_plus_2);\n\t}\n\telse\n\t{\n\t\t&lt;%java.lang.String%&gt; _name = this.getConnects().get(0).getName();\n\t\t&lt;%java.lang.String%&gt; _plus_3 = (\"Link between \" + _name);\n\t\t&lt;%java.lang.String%&gt; _plus_4 = (_plus_3 + \" and \");\n\t\t&lt;%java.lang.String%&gt; _name_1 = this.getConnects().get(1).getName();\n\t\t&lt;%java.lang.String%&gt; _plus_5 = (_plus_4 + _name_1);\n\t\tthis.setName(_plus_5);\n\t}\n}\nreturn this.getName();'"
 	 * @generated
 	 */
 	String getName_generated();
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
index a50ac472d655b3894c7a9a17da817306e3f7f100..89963ab14cb8eb1a8fbf3e3b572bb53c045a1e5d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
@@ -267,8 +267,8 @@ public class LinkImpl extends IdentifierImpl implements Link {
 			}
 			else {
 				String _name = this.getConnects().get(0).getName();
-				String _plus_3 = ("Link_" + _name);
-				String _plus_4 = (_plus_3 + "<-->");
+				String _plus_3 = ("Link between " + _name);
+				String _plus_4 = (_plus_3 + " and ");
 				String _name_1 = this.getConnects().get(1).getName();
 				String _plus_5 = (_plus_4 + _name_1);
 				this.setName(_plus_5);