diff --git a/src/common/models/ldap.go b/src/common/models/ldap.go
index f642d1c84..619d631ce 100644
--- a/src/common/models/ldap.go
+++ b/src/common/models/ldap.go
@@ -18,11 +18,11 @@ package models
 // LdapConf holds information about repository that accessed most
 type LdapConf struct {
 	LdapURL            string `json:"ldap_url"`
-	LdapSearchDn       string `json:"ldap_searchdn"`
-	LdapSearchPwd      string `json:"ldap_search_pwd"`
-	LdapBaseDn         string `json:"ldap_basedn"`
+	LdapSearchDn       string `json:"ldap_search_dn"`
+	LdapSearchPassword string `json:"ldap_search_password"`
+	LdapBaseDn         string `json:"ldap_base_dn"`
 	LdapFilter         string `json:"ldap_filter"`
 	LdapUID            string `json:"ldap_uid"`
 	LdapScope          int    `json:"ldap_scope"`
-	LdapConnectTimeout int    `json:"ldap_connect_timeout"`
+	LdapConnectionTimeout int    `json:"ldap_connection_timeout"`
 }
diff --git a/src/ui/api/ldap.go b/src/ui/api/ldap.go
index 0976ac672..1a0714445 100644
--- a/src/ui/api/ldap.go
+++ b/src/ui/api/ldap.go
@@ -80,8 +80,8 @@ func validateLdapReq(ldapConfs models.LdapConf) error {
 	}
 	log.Debug("ldapURL:", ldapURL)
 
-	ldapConnectTimeout := ldapConfs.LdapConnectTimeout
-	log.Debug("ldapConnectTimeout:", ldapConnectTimeout)
+	ldapConnectionTimeout := ldapConfs.LdapConnectionTimeout
+	log.Debug("ldapConnectionTimeout:", ldapConnectionTimeout)
 
 	return nil
 
@@ -128,8 +128,8 @@ func connectTest(ldapConfs models.LdapConf) error {
 	}
 
 	// Sets a Dial Timeout for LDAP
-	connectTimeout := ldapConfs.LdapConnectTimeout
-	goldap.DefaultTimeout = time.Duration(connectTimeout) * time.Second
+	connectionTimeout := ldapConfs.LdapConnectionTimeout
+	goldap.DefaultTimeout = time.Duration(connectionTimeout) * time.Second
 
 	switch protocol {
 	case "ldap":
@@ -146,8 +146,8 @@ func connectTest(ldapConfs models.LdapConf) error {
 	ldapSearchDn := ldapConfs.LdapSearchDn
 	if ldapSearchDn != "" {
 		log.Debug("Search DN: ", ldapSearchDn)
-		ldapSearchPwd := ldapConfs.LdapSearchPwd
-		err = ldap.Bind(ldapSearchDn, ldapSearchPwd)
+		ldapSearchPassword := ldapConfs.LdapSearchPassword
+		err = ldap.Bind(ldapSearchDn, ldapSearchPassword)
 		if err != nil {
 			log.Debug("Bind search dn error", err)
 			return err