diff --git a/ChangeLog b/ChangeLog
index 16ec2c914..44c33e957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-17  Cyril Robert <crobert@inverse.ca>
+
+	* UI/Contacts/UIxListEditor.m: Renamed "name" to "listName"
+
 2009-09-16  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Updated the ICSimport text to be more specific
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index be347bbeb..893a4710c 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -38,11 +38,11 @@
 @implementation UIxListEditor
 
 
-- (NSString *) name
+- (NSString *) listName
 {
   return [list fn];
 }
-- (void) setName: (NSString *) newName
+- (void) setListName: (NSString *) newName
 {
   [list setFn: newName];
 }
diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox
index 0ac8ff469..91a82e269 100644
--- a/UI/Templates/ContactsUI/UIxListEditor.wox
+++ b/UI/Templates/ContactsUI/UIxListEditor.wox
@@ -19,10 +19,10 @@
       <div id="listEditor">
         <h3><var:string label:value="List details" /></h3>
         <table><tr><td width="20%"><var:string label:value="List name:"/></td>
-            <td><input type="text" const:id="name" const:name="name"
-                var:value="name" class="textField" /></td></tr>
+            <td><input type="text" const:id="listName" const:name="listName"
+                var:value="listName" class="textField" /></td></tr>
           <tr><td><var:string label:value="List nickname:"/></td>
-            <td><input type="text" const:id="nickname" const:name="nickname"
+            <td><input type="text" const:id="nicktname" const:name="nickname"
                 var:value="nickname" class="textField" /></td></tr>
           <tr><td><var:string label:value="List description:"/></td>
             <td><input type="text" const:id="description" const:name="description"