diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml
index 6221e8db3..86bbbaab7 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.3.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml
@@ -269,10 +269,10 @@
             <column name="connector_property_position" type="INTEGER">
                 <constraints nullable="false" />
             </column>
-            <column name="key" type="VARCHAR(255)">
+            <column name="property_key" type="VARCHAR(255)">
                 <constraints nullable="false" />
             </column>
-            <column name="value" type="VARCHAR(255)" />
+            <column name="property_value" type="VARCHAR(255)" />
         </createTable>
 
         <addPrimaryKey
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml
index 4a1b86870..9ee20be34 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml
@@ -19,9 +19,9 @@
             <list-index column="connector_property_position" />
 
             <composite-element class="ConnectorProperty">
-                <property name="key" column="key"
+                <property name="key" column="property_key"
                     not-null="true" />
-                <property name="value" column="value" />
+                <property name="value" column="property_value" />
             </composite-element>
         </list>