diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 03926e5a0794f..e6e18154f9e2b 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -1001,7 +1001,7 @@ PHP_FUNCTION(ldap_connect)
 		WRONG_PARAM_COUNT;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|slssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!lssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) {
 		RETURN_THROWS();
 	}
 
@@ -1009,7 +1009,7 @@ PHP_FUNCTION(ldap_connect)
 		ssl = 1;
 	}
 #else
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sl", &host, &hostlen, &port) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!l", &host, &hostlen, &port) != SUCCESS) {
 		RETURN_THROWS();
 	}
 #endif
@@ -1119,7 +1119,7 @@ PHP_FUNCTION(ldap_bind)
 	ldap_linkdata *ld;
 	int rc;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|ss", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen) != SUCCESS) {
 		RETURN_THROWS();
 	}
 
@@ -1175,7 +1175,7 @@ PHP_FUNCTION(ldap_bind_ext)
 	LDAPMessage *ldap_res;
 	int rc;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|ssa", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen, &serverctrls) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!a", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen, &serverctrls) != SUCCESS) {
 		RETURN_THROWS();
 	}
 
@@ -1337,7 +1337,7 @@ PHP_FUNCTION(ldap_sasl_bind)
 	size_t rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len, authz_id_len, props_len;
 	php_ldap_bictx *ctx;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|sssssss", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!s!s!s!s!", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) {
 		RETURN_THROWS();
 	}
 
@@ -1601,12 +1601,12 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
 		}
 
 		if (!base_dn_str) {
-			zend_argument_type_error(2, "must be of type string when argument #1 ($link_identifier) is a resource");
+			zend_argument_type_error(2, "must be of type string when argument #1 ($ldap) is a resource");
 		}
 		ldap_base_dn = zend_string_copy(base_dn_str);
 
 		if (!filter_str) {
-			zend_argument_type_error(3, "must be of type string when argument #1 ($link_identifier) is a resource");
+			zend_argument_type_error(3, "must be of type string when argument #1 ($ldap) is a resource");
 		}
 		ldap_filter = zend_string_copy(filter_str);
 
@@ -1909,9 +1909,8 @@ PHP_FUNCTION(ldap_first_attribute)
 	ldap_linkdata *ld;
 	ldap_resultentry *resultentry;
 	char *attribute;
-	zend_long dummy_ber;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry, &dummy_ber) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &link, &result_entry) != SUCCESS) {
 		RETURN_THROWS();
 	}
 
@@ -1941,9 +1940,8 @@ PHP_FUNCTION(ldap_next_attribute)
 	ldap_linkdata *ld;
 	ldap_resultentry *resultentry;
 	char *attribute;
-	zend_long dummy_ber;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry, &dummy_ber) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &link, &result_entry) != SUCCESS) {
 		RETURN_THROWS();
 	}
 
diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index 372458fe78b9e..df973b933cb33 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -4,281 +4,281 @@
 
 #ifdef HAVE_ORALDAP
 /** @return resource|false */
-function ldap_connect(string $hostname = UNKNOWN, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {}
+function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNKNOWN, string $password = UNKNOWN, int $auth_mode = GSLC_SSL_NO_AUTH) {}
 #else
 /** @return resource|false */
-function ldap_connect(string $hostname = UNKNOWN, int $port = 389) {}
+function ldap_connect(?string $uri = null, int $port = 389) {}
 #endif
 
-/** @param resource $link_identifier */
-function ldap_unbind($link_identifier): bool {}
+/** @param resource $ldap */
+function ldap_unbind($ldap): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @alias ldap_unbind
  */
-function ldap_close($link_identifier): bool {}
+function ldap_close($ldap): bool {}
 
-/** @param resource $link_identifier */
-function ldap_bind($link_identifier, string $bind_rdn = UNKNOWN, string $bind_password = UNKNOWN): bool {}
+/** @param resource $ldap */
+function ldap_bind($ldap, ?string $dn = null, ?string $password = null): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_bind_ext($link_identifier, string $bind_rdn = UNKNOWN, string $bind_password = UNKNOWN, array $servercontrols = []) {}
+function ldap_bind_ext($ldap, ?string $dn = null, ?string $password = null, array $controls = []) {}
 
 #ifdef HAVE_LDAP_SASL
-/** @param resource $link */
-function ldap_sasl_bind($link, string $binddn = UNKNOWN, string $password = UNKNOWN, string $sasl_mech = UNKNOWN, string $sasl_realm = UNKNOWN, string $sasl_authc_id = UNKNOWN, string $sasl_authz_id = UNKNOWN, string $props = UNKNOWN): bool {}
+/** @param resource $ldap */
+function ldap_sasl_bind($ldap, ?string $dn = null, ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authc_id = null, ?string $authz_id = null, ?string $props = null): bool {}
 #endif
 
 /**
- * @param resource|array $link_identifier
+ * @param resource|array $ldap
  * @return resource|false
  */
-function ldap_read($link_identifier, array|string $base_dn, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {}
+function ldap_read($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
 
 /**
- * @param resource|array $link_identifier
+ * @param resource|array $ldap
  * @return resource|false
  */
-function ldap_list($link_identifier, array|string $base_dn, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {}
+function ldap_list($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
 
 /**
- * @param resource|array $link_identifier
+ * @param resource|array $ldap
  * @return resource|false
  */
-function ldap_search($link_identifier, array|string $base_dn, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {}
+function ldap_search($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
 
-/** @param resource $link_identifier */
-function ldap_free_result($link_identifier): bool {}
+/** @param resource $ldap */
+function ldap_free_result($ldap): bool {}
 
 
 /**
- * @param resource $link_identifier
- * @param resource $result_identifier
+ * @param resource $ldap
+ * @param resource $result
  */
-function ldap_count_entries($link_identifier, $result_identifier): int {}
+function ldap_count_entries($ldap, $result): int {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_identifier
+ * @param resource $ldap
+ * @param resource $result
  * @return resource|false
  */
-function ldap_first_entry($link_identifier, $result_identifier) {}
+function ldap_first_entry($ldap, $result) {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_identifier
+ * @param resource $ldap
+ * @param resource $result
  * @return resource|false
  */
-function ldap_next_entry($link_identifier, $result_identifier) {}
+function ldap_next_entry($ldap, $result) {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_identifier
+ * @param resource $ldap
+ * @param resource $result
  */
-function ldap_get_entries($link_identifier, $result_identifier): array|false {}
+function ldap_get_entries($ldap, $result): array|false {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_entry_identifier
+ * @param resource $ldap
+ * @param resource $entry
  */
-function ldap_first_attribute($link_identifier, $result_entry_identifier, int $dummy_ber = UNKNOWN): string|false {}
+function ldap_first_attribute($ldap, $entry): string|false {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_entry_identifier
+ * @param resource $ldap
+ * @param resource $entry
  */
-function ldap_next_attribute($link_identifier, $result_entry_identifier, int $dummy_ber = UNKNOWN): string|false {}
+function ldap_next_attribute($ldap, $entry): string|false {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_entry_identifier
+ * @param resource $ldap
+ * @param resource $entry
  */
-function ldap_get_attributes($link_identifier, $result_entry_identifier): array {}
+function ldap_get_attributes($ldap, $entry): array {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_entry_identifier
+ * @param resource $ldap
+ * @param resource $entry
  */
-function ldap_get_values_len($link_identifier, $result_entry_identifier, string $attribute): array|false {}
+function ldap_get_values_len($ldap, $entry, string $attribute): array|false {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_entry_identifier
+ * @param resource $ldap
+ * @param resource $entry
  * @alias ldap_get_values_len
  */
-function ldap_get_values($link_identifier, $result_entry_identifier, string $attribute): array|false {}
+function ldap_get_values($ldap, $entry, string $attribute): array|false {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_entry_identifier
+ * @param resource $ldap
+ * @param resource $entry
  */
-function ldap_get_dn($link_identifier, $result_entry_identifier): string|false {}
+function ldap_get_dn($ldap, $entry): string|false {}
 
 function ldap_explode_dn(string $dn, int $with_attrib): array|false {}
 
 function ldap_dn2ufn(string $dn): string|false {}
 
-/** @param resource $link_identifier */
-function ldap_add($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_add($ldap, string $dn, array $entry, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_add_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
+function ldap_add_ext($ldap, string $dn, array $entry, array $controls = []) {}
 
-/** @param resource $link_identifier */
-function ldap_delete($link_identifier, string $dn, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_delete($ldap, string $dn, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_delete_ext($link_identifier, string $dn, array $servercontrols = []) {}
+function ldap_delete_ext($ldap, string $dn, array $controls = []) {}
 
-/** @param resource $link_identifier */
-function ldap_modify_batch($link_identifier, string $dn, array $modifications_info, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_modify_batch($ldap, string $dn, array $modifications_info, array $controls = []): bool {}
 
-/** @param resource $link_identifier */
-function ldap_mod_add($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_mod_add($ldap, string $dn, array $entry, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_mod_add_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
+function ldap_mod_add_ext($ldap, string $dn, array $entry, array $controls = []) {}
 
-/** @param resource $link_identifier */
-function ldap_mod_replace($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_mod_replace($ldap, string $dn, array $entry, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @alias ldap_mod_replace
  */
-function ldap_modify($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
+function ldap_modify($ldap, string $dn, array $entry, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_mod_replace_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
+function ldap_mod_replace_ext($ldap, string $dn, array $entry, array $controls = []) {}
 
-/** @param resource $link_identifier */
-function ldap_mod_del($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_mod_del($ldap, string $dn, array $entry, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_mod_del_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
+function ldap_mod_del_ext($ldap, string $dn, array $entry, array $controls = []) {}
 
-/** @param resource $link */
-function ldap_errno($link): int {}
+/** @param resource $ldap */
+function ldap_errno($ldap): int {}
 
-/** @param resource $link */
-function ldap_error($link): string {}
+/** @param resource $ldap */
+function ldap_error($ldap): string {}
 
 function ldap_err2str(int $errno): string {}
 
-/** @param resource $link_identifier */
-function ldap_compare($link_identifier, string $dn, string $attribute, string $value, array $servercontrols = []): bool|int {}
+/** @param resource $ldap */
+function ldap_compare($ldap, string $dn, string $attribute, string $value, array $controls = []): bool|int {}
 
 
 #ifdef LDAP_CONTROL_PAGEDRESULTS
 /**
- * @param resource $link
+ * @param resource $ldap
  * @deprecated since 7.4
  */
-function ldap_control_paged_result($link, int $pagesize, bool $iscritical = false, string $cookie = ""): bool {}
+function ldap_control_paged_result($ldap, int $pagesize, bool $iscritical = false, string $cookie = ""): bool {}
 
 /**
- * @param resource $link
+ * @param resource $ldap
  * @param resource $result
  * @param string $cookie
  * @param int $estimated
  * @deprecated since 7.4
  */
-function ldap_control_paged_result_response($link, $result, &$cookie = null, &$estimated = null): bool {}
+function ldap_control_paged_result_response($ldap, $result, &$cookie = null, &$estimated = null): bool {}
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
-/** @param resource $link_identifier */
-function ldap_rename($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []): bool {}
+/** @param resource $ldap */
+function ldap_rename($ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, array $controls = []): bool {}
 
 /**
- * @param resource $link_identifier
+ * @param resource $ldap
  * @return resource|false
  */
-function ldap_rename_ext($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []) {}
+function ldap_rename_ext($ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, array $controls = []) {}
 
 
 /**
- * @param resource $link_identifier
- * @param array|string|int $retval
+ * @param resource $ldap
+ * @param array|string|int $value
  */
-function ldap_get_option($link_identifier, int $option, &$retval = null): bool {}
+function ldap_get_option($ldap, int $option, &$value = null): bool {}
 
 /**
- * @param resource|null $link_identifier
- * @param array|string|int|bool $newval
+ * @param resource|null $ldap
+ * @param array|string|int|bool $value
  */
-function ldap_set_option($link_identifier, int $option, $newval): bool {}
+function ldap_set_option($ldap, int $option, $value): bool {}
 
 /**
- * @param resource $link_identifier
- * @param resource $result_identifier
+ * @param resource $ldap
+ * @param resource $result
  */
-function ldap_count_references($link_identifier, $result_identifier): int {}
+function ldap_count_references($ldap, $result): int {}
 
 /**
- * @param resource $link
+ * @param resource $ldap
  * @param resource $result
  * @return resource|false
  */
-function ldap_first_reference($link, $result) {}
+function ldap_first_reference($ldap, $result) {}
 
 /**
- * @param resource $link
+ * @param resource $ldap
  * @param resource $entry
  * @return resource|false
  */
-function ldap_next_reference($link, $entry) {}
+function ldap_next_reference($ldap, $entry) {}
 
 #ifdef HAVE_LDAP_PARSE_REFERENCE
 /**
- * @param resource $link
+ * @param resource $ldap
  * @param resource $entry
  * @param array $referrals
  */
-function ldap_parse_reference($link, $entry, &$referrals): bool {}
+function ldap_parse_reference($ldap, $entry, &$referrals): bool {}
 #endif
 
 #ifdef HAVE_LDAP_PARSE_RESULT
 /**
- * @param resource $link
+ * @param resource $ldap
  * @param resource $result
- * @param int $errcode
- * @param string $matcheddn
- * @param string $errmsg
+ * @param int $error_code
+ * @param string $matched_dn
+ * @param string $error_message
  * @param array $referrals
- * @param array $serverctrls
+ * @param array $controls
  */
-function ldap_parse_result($link, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$serverctrls = null): bool {}
+function ldap_parse_result($ldap, $result, &$error_code, &$matched_dn = null, &$error_message = null, &$referrals = null, &$controls = null): bool {}
 #endif
 #endif
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
-/** @param resource $link */
-function ldap_set_rebind_proc($link, ?callable $callback): bool {}
+/** @param resource $ldap */
+function ldap_set_rebind_proc($ldap, ?callable $callback): bool {}
 #endif
 
 #ifdef HAVE_LDAP_START_TLS_S
-/** @param resource $link_identifier */
-function ldap_start_tls($link_identifier): bool {}
+/** @param resource $ldap */
+function ldap_start_tls($ldap): bool {}
 #endif
 
 function ldap_escape(string $value, string $ignore = "", int $flags = 0): string {}
@@ -292,39 +292,39 @@ function ldap_8859_to_t61(string $value): string|false {}
 
 #ifdef HAVE_LDAP_EXTENDED_OPERATION_S
 /**
- * @param resource $link
- * @param string $retdata
- * @param string $retoid
+ * @param resource $ldap
+ * @param string $response_data
+ * @param string $response_oid
  * @return resource|bool
  */
-function ldap_exop($link, string $reqoid, ?string $reqdata = null, ?array $servercontrols = [], &$retdata = null, &$retoid = null) {}
+function ldap_exop($ldap, string $request_oid, ?string $request_data = null, ?array $controls = [], &$response_data = null, &$response_oid = null) {}
 #endif
 
 #ifdef HAVE_LDAP_PASSWD
 /**
- * @param resource $link
- * @param array $serverctrls
+ * @param resource $ldap
+ * @param array $controls
  */
-function ldap_exop_passwd($link, string $user = "", string $oldpw = "", string $newpw = "", &$serverctrls = null): string|bool {}
+function ldap_exop_passwd($ldap, string $user = "", string $old_password = "", string $new_password = "", &$controls = null): string|bool {}
 #endif
 
 
 #ifdef HAVE_LDAP_WHOAMI_S
-/** @param resource $link */
-function ldap_exop_whoami($link): string|bool {}
+/** @param resource $ldap */
+function ldap_exop_whoami($ldap): string|bool {}
 #endif
 
 #ifdef HAVE_LDAP_REFRESH_S
-/** @param resource $link */
-function ldap_exop_refresh($link, string $dn, int $ttl): int|false {}
+/** @param resource $ldap */
+function ldap_exop_refresh($ldap, string $dn, int $ttl): int|false {}
 #endif
 
 #ifdef HAVE_LDAP_PARSE_EXTENDED_RESULT
 /**
- * @param resource $link
+ * @param resource $ldap
  * @param resource $result
- * @param string $retdata
- * @param string $retoid
+ * @param string $response_data
+ * @param string $response_oid
  */
-function ldap_parse_exop($link, $result, &$retdata = null, &$retoid = null): bool {}
+function ldap_parse_exop($ldap, $result, &$response_data = null, &$response_oid = null): bool {}
 #endif
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index d610408d97423..4b73b68d8f32c 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -1,65 +1,65 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f07138972651411473c34c5ee2d0c2de94e01ada */
+ * Stub hash: 0c721a3272fef9d1a06a8cb4163eeb219661fb00 */
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389")
 	ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, wallet_passwd, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authmode, IS_LONG, 0, "GSLC_SSL_NO_AUTH")
+	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auth_mode, IS_LONG, 0, "GSLC_SSL_NO_AUTH")
 ZEND_END_ARG_INFO()
 #endif
 
 #if !(defined(HAVE_ORALDAP))
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_unbind, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_close arginfo_ldap_unbind
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_bind, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_TYPE_INFO(0, bind_rdn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, bind_password, IS_STRING, 0)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_TYPE_INFO(0, bind_rdn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, bind_password, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_LDAP_SASL)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_sasl_bind, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
-	ZEND_ARG_TYPE_INFO(0, binddn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, sasl_mech, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, sasl_realm, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, sasl_authc_id, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, sasl_authz_id, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, props, IS_STRING, 0)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mech, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, realm, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authc_id, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authz_id, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_TYPE_MASK(0, base_dn, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_TYPE_MASK(0, base, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes, IS_ARRAY, 0, "[]")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attrsonly, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes_only, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sizelimit, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timelimit, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deref, IS_LONG, 0, "LDAP_DEREF_NEVER")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_list arginfo_ldap_read
@@ -69,47 +69,43 @@ ZEND_END_ARG_INFO()
 #define arginfo_ldap_free_result arginfo_ldap_unbind
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_entries, 0, 2, IS_LONG, 0)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_identifier)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_entry, 0, 0, 2)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_identifier)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_next_entry arginfo_ldap_first_entry
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_entries, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_identifier)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_first_attribute, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_entry_identifier)
-	ZEND_ARG_TYPE_INFO(0, dummy_ber, IS_LONG, 0)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_next_attribute arginfo_ldap_first_attribute
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_attributes, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_entry_identifier)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_values_len, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_entry_identifier)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, entry)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_get_values arginfo_ldap_get_values_len
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_dn, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_entry_identifier)
-ZEND_END_ARG_INFO()
+#define arginfo_ldap_get_dn arginfo_ldap_first_attribute
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_explode_dn, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
@@ -121,36 +117,36 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_dn2ufn, 0, 1, MAY_BE_STRING
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_add, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, entry, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_add_ext, 0, 0, 3)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, entry, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_delete, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_delete_ext, 0, 0, 2)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_modify_batch, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, modifications_info, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_mod_add arginfo_ldap_add
@@ -168,11 +164,11 @@ ZEND_END_ARG_INFO()
 #define arginfo_ldap_mod_del_ext arginfo_ldap_add_ext
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_errno, 0, 1, IS_LONG, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_error, 0, 1, IS_STRING, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_err2str, 0, 1, IS_STRING, 0)
@@ -180,16 +176,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_err2str, 0, 1, IS_STRING, 0
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_compare, 0, 4, MAY_BE_BOOL|MAY_BE_LONG)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 #if defined(LDAP_CONTROL_PAGEDRESULTS)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_control_paged_result, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, pagesize, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iscritical, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cookie, IS_STRING, 0, "\"\"")
@@ -198,7 +194,7 @@ ZEND_END_ARG_INFO()
 
 #if defined(LDAP_CONTROL_PAGEDRESULTS)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_control_paged_result_response, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, result)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, cookie, "null")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, estimated, "null")
@@ -207,66 +203,66 @@ ZEND_END_ARG_INFO()
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO(0, new_rdn, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, new_parent, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, delete_old_rdn, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]")
+	ZEND_ARG_TYPE_INFO(0, new_rdn, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, new_parent, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, delete_old_rdn, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, value, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_option, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
-	ZEND_ARG_INFO(0, newval)
+	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_references, 0, 2, IS_LONG, 0)
-	ZEND_ARG_INFO(0, link_identifier)
-	ZEND_ARG_INFO(0, result_identifier)
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_reference, 0, 0, 2)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_reference, 0, 0, 2)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 #endif
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_REFERENCE)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_reference, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, entry)
 	ZEND_ARG_INFO(1, referrals)
 ZEND_END_ARG_INFO()
@@ -274,26 +270,26 @@ ZEND_END_ARG_INFO()
 
 #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_RESULT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, result)
-	ZEND_ARG_INFO(1, errcode)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matcheddn, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errmsg, "null")
+	ZEND_ARG_INFO(1, error_code)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matched_dn, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, referrals, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, serverctrls, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_rebind_proc, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_LDAP_START_TLS_S)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_start_tls, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link_identifier)
+	ZEND_ARG_INFO(0, ldap)
 ZEND_END_ARG_INFO()
 #endif
 
@@ -315,34 +311,34 @@ ZEND_END_ARG_INFO()
 
 #if defined(HAVE_LDAP_EXTENDED_OPERATION_S)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2)
-	ZEND_ARG_INFO(0, link)
-	ZEND_ARG_TYPE_INFO(0, reqoid, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reqdata, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 1, "[]")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null")
+	ZEND_ARG_INFO(0, ldap)
+	ZEND_ARG_TYPE_INFO(0, request_oid, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request_data, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_LDAP_PASSWD)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_passwd, 0, 1, MAY_BE_STRING|MAY_BE_BOOL)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, user, IS_STRING, 0, "\"\"")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, oldpw, IS_STRING, 0, "\"\"")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, newpw, IS_STRING, 0, "\"\"")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, serverctrls, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, old_password, IS_STRING, 0, "\"\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, new_password, IS_STRING, 0, "\"\"")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_LDAP_WHOAMI_S)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_whoami, 0, 1, MAY_BE_STRING|MAY_BE_BOOL)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_LDAP_REFRESH_S)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_refresh, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, ttl, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -350,10 +346,10 @@ ZEND_END_ARG_INFO()
 
 #if defined(HAVE_LDAP_PARSE_EXTENDED_RESULT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_exop, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, link)
+	ZEND_ARG_INFO(0, ldap)
 	ZEND_ARG_INFO(0, result)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
 ZEND_END_ARG_INFO()
 #endif
 
diff --git a/ext/ldap/tests/ldap_search_error.phpt b/ext/ldap/tests/ldap_search_error.phpt
index cc4653f2b7bf2..7041c66746b01 100644
--- a/ext/ldap/tests/ldap_search_error.phpt
+++ b/ext/ldap/tests/ldap_search_error.phpt
@@ -46,6 +46,6 @@ bool(false)
 
 Warning: ldap_search(): Array initialization wrong in %s on line %d
 bool(false)
-ldap_search(): Argument #1 ($link_identifier) cannot be empty
-ldap_search(): Argument #2 ($base_dn) must have the same number of elements as the links array
+ldap_search(): Argument #1 ($ldap) cannot be empty
+ldap_search(): Argument #2 ($base) must have the same number of elements as the links array
 ldap_search(): Argument #3 ($filter) must have the same number of elements as the links array
diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt
index f97193e22b581..fba37df6ef34d 100644
--- a/ext/ldap/tests/ldap_set_option_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_error.phpt
@@ -38,6 +38,6 @@ var_dump(ldap_set_option($link, 999999, 999999));
 --EXPECT--
 bool(false)
 ValueError: ldap_set_option(): Control must have an "oid" key
-TypeError: ldap_set_option(): Argument #3 ($newval) must contain only arrays, where each array is a control
-TypeError: ldap_set_option(): Argument #3 ($newval) must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, string given
+TypeError: ldap_set_option(): Argument #3 ($value) must contain only arrays, where each array is a control
+TypeError: ldap_set_option(): Argument #3 ($value) must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, string given
 bool(false)