diff --git a/src/Makefile.am b/src/Makefile.am
index 0242555..a8ab774 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,15 +2,15 @@ INCLUDES    = $(all_includes) $(KDE_INCLUDES)/tde
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = kcm_ldap.la
+kde_module_LTLIBRARIES = kcm_ldapbonding.la
 
-kcm_ldap_la_SOURCES = ldapbonding.cpp ldapconfigbase.ui realmpropertiesdialog.cpp bondintropage.cpp bondintropagedlg.ui bondrealmpage.cpp bondrealmpagedlg.ui bondfinishpage.cpp bondfinishpagedlg.ui bondwizard.cpp ldappasswddlg.cpp
-kcm_ldap_la_LIBADD = -lkio $(LIB_TDEUI) -ltdeldap
-kcm_ldap_la_LDFLAGS = -avoid-version -module -no-undefined \
+kcm_ldapbonding_la_SOURCES = ldapbonding.cpp ldapconfigbase.ui realmpropertiesdialog.cpp bondintropage.cpp bondintropagedlg.ui bondrealmpage.cpp bondrealmpagedlg.ui bondfinishpage.cpp bondfinishpagedlg.ui bondwizard.cpp ldappasswddlg.cpp
+kcm_ldapbonding_la_LIBADD = -lkio $(LIB_TDEUI) -ltdeldap
+kcm_ldapbonding_la_LDFLAGS = -avoid-version -module -no-undefined \
 	$(all_libraries)
 
 
-xdg_apps_DATA = ldap.desktop
+xdg_apps_DATA = ldapbonding.desktop
 
 
 messages: rc.cpp
diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp
index 97117e8..b9ed7eb 100644
--- a/src/ldapbonding.cpp
+++ b/src/ldapbonding.cpp
@@ -57,7 +57,7 @@
 
 typedef KGenericFactory<LDAPConfig, TQWidget> ldapFactory;
 
-K_EXPORT_COMPONENT_FACTORY( kcm_ldap, ldapFactory("kcmldap"))
+K_EXPORT_COMPONENT_FACTORY( kcm_ldapbonding, ldapFactory("kcmldapbonding"))
 
 KSimpleConfig *systemconfig = 0;
 
diff --git a/src/ldap.desktop b/src/ldapbonding.desktop
similarity index 87%
rename from src/ldap.desktop
rename to src/ldapbonding.desktop
index 3555671..29fd5c7 100644
--- a/src/ldap.desktop
+++ b/src/ldapbonding.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell ldap
+Exec=kcmshell ldapbonding
 Icon=tdmconfig
 Type=Application
 
 X-TDE-ModuleType=Library
-X-TDE-Library=ldap
+X-TDE-Library=ldapbonding
 X-TDE-HasReadOnlyMode=true
 X-TDE-ParentApp=kcontrol
 X-TDE-RootOnly=true