diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile
index 57b4cb0f3..c6effab6d 100644
--- a/SoObjects/Appointments/GNUmakefile
+++ b/SoObjects/Appointments/GNUmakefile
@@ -11,7 +11,6 @@ Appointments_PRINCIPAL_CLASS = SOGoAppointmentsProduct
 Appointments_OBJC_FILES = \
 	Product.m			\
 	NSArray+Appointments.m		\
-	iCalEntityObject+Agenor.m	\
 	\
 	SOGoCalendarComponent.m		\
 	SOGoAppointmentObject.m		\
diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile
index af94111fc..3c1711c11 100644
--- a/SoObjects/Contacts/GNUmakefile
+++ b/SoObjects/Contacts/GNUmakefile
@@ -12,10 +12,8 @@ Contacts_OBJC_FILES =			\
 	SOGoContactFolders.m		\
 	SOGoContactGCSEntry.m		\
 	SOGoContactGCSFolder.m		\
-	SOGoContactLDAPEntry.m		\
+	SOGoContactLDIFEntry.m		\
 	SOGoContactLDAPFolder.m		\
-					\
-	NGLdapEntry+Contact.m		\
 
 Contacts_RESOURCE_FILES +=		\
 	Version				\
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index 15b792769..3ad28ac9f 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -8,10 +8,10 @@ include $(GNUSTEP_MAKEFILES)/common.make
 LIBRARY_NAME = libSOGo
 
 TOOL_NAME = \
-	agenor_email2uid	\
-	agenor_shares4uid	\
-	agenor_emails4uid	\
-	agenor_defaults
+# 	agenor_email2uid	\
+# 	agenor_shares4uid	\
+# 	agenor_emails4uid	\
+# 	agenor_defaults
 
 libSOGo_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
@@ -28,7 +28,8 @@ libSOGo_HEADER_FILES = \
 	SOGoGroupFolder.h		\
 	SOGoCustomGroupFolder.h		\
 	\
-	AgenorUserManager.h		\
+	LDAPUserManager.h		\
+	LDAPSource.h			\
 	SOGoPermissions.h		\
 	SOGoLRUCache.h			\
 	NSArray+Utilities.h		\
@@ -53,7 +54,8 @@ libSOGo_OBJC_FILES = \
 	\
 	SOGoPermissions.m		\
 	SOGoLRUCache.m			\
-	AgenorUserManager.m		\
+	LDAPUserManager.m		\
+	LDAPSource.m			\
 	NSObject+AptComparison.m	\
 	WOContext+Agenor.m		\
 	SOGoDAVRendererTypes.m		\
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 4250113d2..66c045d8e 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -18,7 +18,7 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalDateSelector.m		\
 	UIxCalUserRightsEditor.m	\
 					\
-	UIxComponent+Agenor.m		\
+	UIxComponent+Scheduler.m	\
 	UIxCalView.m			\
 	UIxCalAptListView.m		\
 	UIxCalTasksListView.m		\