diff --git a/ChangeLog b/ChangeLog
index e87a5f49e..a297231a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactsListViewContainerBase.m: 
+	UIxContactsListViewContainer renamed to serve as a base class for
+	the contact lists in both the contact editor and the contact
+	selectors.
+
 	* SoObjects/Contacts/SOGoContactLDAPFolder.m
 	([SOGoContactLDAPFolder
 	-LDAPSetHostname:setPort:setBindDN:setBindPW:setContactIdentifier:
diff --git a/UI/Contacts/UIxContactsListViewContainer.h b/UI/Contacts/UIxContactsListViewContainerBase.h
similarity index 82%
rename from UI/Contacts/UIxContactsListViewContainer.h
rename to UI/Contacts/UIxContactsListViewContainerBase.h
index 8d4e25980..bfc0e844d 100644
--- a/UI/Contacts/UIxContactsListViewContainer.h
+++ b/UI/Contacts/UIxContactsListViewContainerBase.h
@@ -1,4 +1,4 @@
-/* UIxContactsListViewContainer.h - this file is part of SOGo
+/* UIxContactsListViewContainerBase.h - this file is part of SOGo
  *
  * Copyright (C) 2006 Inverse groupe conseil
  *
@@ -20,15 +20,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef UIXCONTACTSLISTVIEWCONTAINER_H
-#define UIXCONTACTSLISTVIEWCONTAINER_H
+#ifndef UIXCONTACTSLISTVIEWCONTAINERBASE_H
+#define UIXCONTACTSLISTVIEWCONTAINERBASE_H
 
 #import <SOGoUI/UIxComponent.h>
 
 @class NSArray;
 @class SOGoContactFolder;
 
-@interface UIxContactsListViewContainer : UIxComponent
+@interface UIxContactsListViewContainerBase : UIxComponent
 {
   NSString *foldersPrefix;
   id currentFolder;
@@ -46,4 +46,4 @@
 
 @end
 
-#endif /* UIXCONTACTSLISTVIEWCONTAINER_H */
+#endif /* UIXCONTACTSLISTVIEWCONTAINERBASE_H */
diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainerBase.m
similarity index 93%
rename from UI/Contacts/UIxContactsListViewContainer.m
rename to UI/Contacts/UIxContactsListViewContainerBase.m
index 2b11661f3..ebdc369a3 100644
--- a/UI/Contacts/UIxContactsListViewContainer.m
+++ b/UI/Contacts/UIxContactsListViewContainerBase.m
@@ -1,4 +1,4 @@
-/* UIxContactsListViewContainer.m - this file is part of $PROJECT_NAME_HERE$
+/* UIxContactsListViewContainerBase.m - this file is part of SOGo
  *
  * Copyright (C) 2006 Inverse groupe conseil
  *
@@ -27,11 +27,11 @@
 
 #import <SoObjects/Contacts/SOGoContactFolder.h>
 
-#import "UIxContactsListViewContainer.h"
+#import "UIxContactsListViewContainerBase.h"
 
 @class SOGoContactFolders;
 
-@implementation UIxContactsListViewContainer
+@implementation UIxContactsListViewContainerBase
 
 - (id) init
 {