diff --git a/ext/oci8/oci8.stub.php b/ext/oci8/oci8.stub.php
index 419df17be0956..0c87dfcbb10a4 100644
--- a/ext/oci8/oci8.stub.php
+++ b/ext/oci8/oci8.stub.php
@@ -2,534 +2,468 @@
 
 /** @generate-function-entries */
 
-/** @param resource $statement_resource */
-function oci_define_by_name($statement_resource, string $column_name, mixed &$variable, int $type = 0): bool {}
+/** @param resource $statement */
+function oci_define_by_name($statement, string $column, mixed &$var, int $type = 0): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_define_by_name
  * @deprecated
  */
-function ocidefinebyname($statement_resource, string $column_name, mixed &$variable, int $type = 0): bool {}
+function ocidefinebyname($statement, string $column, mixed &$var, int $type = 0): bool {}
 
-/** @param resource $statement_resource */
-function oci_bind_by_name($statement_resource, string $column_name, mixed &$variable, int $maximum_length = -1, int $type = 0): bool {}
+/** @param resource $statement */
+function oci_bind_by_name($statement, string $param, mixed &$var, int $max_length = -1, int $type = 0): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_bind_by_name
  * @deprecated
  */
-function ocibindbyname($statement_resource, string $column_name, mixed &$variable, int $maximum_length = -1, int $type = 0): bool {}
+function ocibindbyname($statement, string $param, mixed &$var, int $max_length = -1, int $type = 0): bool {}
 
-/** @param resource $statement_resource */
-function oci_bind_array_by_name($statement_resource, string $column_name, mixed &$variable, int $maximum_array_length, int $maximum_item_length = -1, int $type = SQLT_AFC): bool {}
+/** @param resource $statement */
+function oci_bind_array_by_name($statement, string $param, mixed &$var, int $max_array_length, int $max_item_length = -1, int $type = SQLT_AFC): bool {}
 
-function oci_free_descriptor(OCILob $lob_descriptor): bool {}
+function oci_free_descriptor(OCILob $lob): bool {}
 
 /**
  * @alias oci_free_descriptor
  * @deprecated
  */
-function ocifreedesc(OCILob $lob_descriptor): bool {}
+function ocifreedesc(OCILob $lob): bool {}
 
-function oci_lob_save(OCILob $lob_descriptor, string $data, int $offset = 0): bool {}
+function oci_lob_save(OCILob $lob, string $data, int $offset = 0): bool {}
 
 /**
  * @alias oci_lob_save
  * @deprecated
  */
-function ocisavelob(OCILob $lob_descriptor, string $data, int $offset = 0): bool {}
+function ocisavelob(OCILob $lob, string $data, int $offset = 0): bool {}
 
-function oci_lob_import(OCILob $lob_descriptor, string $filename): bool {}
+function oci_lob_import(OCILob $lob, string $filename): bool {}
 
 /**
  * @alias oci_lob_import
  * @deprecated
  */
-function ocisavelobfile(OCILob $lob_descriptor, string $filename): bool {}
+function ocisavelobfile(OCILob $lob, string $filename): bool {}
 
-function oci_lob_load(OCILob $lob_descriptor): string|false {}
+function oci_lob_load(OCILob $lob): string|false {}
 
 /**
  * @alias oci_lob_load
  * @deprecated
  */
-function ociloadlob(OCILob $lob_descriptor): string|false {}
+function ociloadlob(OCILob $lob): string|false {}
 
-function oci_lob_read(OCILob $lob_descriptor, int $length): string|false {}
+function oci_lob_read(OCILob $lob, int $length): string|false {}
 
-function oci_lob_eof(OCILob $lob_descriptor): bool {}
+function oci_lob_eof(OCILob $lob): bool {}
 
-function oci_lob_tell(OCILob $lob_descriptor): int|false {}
+function oci_lob_tell(OCILob $lob): int|false {}
 
-function oci_lob_rewind(OCILob $lob_descriptor): bool {}
+function oci_lob_rewind(OCILob $lob): bool {}
 
-function oci_lob_seek(OCILob $lob_descriptor, int $offset, int $whence = OCI_SEEK_SET): bool {}
+function oci_lob_seek(OCILob $lob, int $offset, int $whence = OCI_SEEK_SET): bool {}
 
-function oci_lob_size(OCILob $lob_descriptor): int|false {}
+function oci_lob_size(OCILob $lob): int|false {}
 
-function oci_lob_write(OCILob $lob_descriptor, string $string, ?int $length = null): int|false {}
+function oci_lob_write(OCILob $lob, string $data, ?int $length = null): int|false {}
 
-function oci_lob_append(OCILob $lob_descriptor_to, OCILob $lob_descriptor_from): bool {}
+function oci_lob_append(OCILob $to, OCILob $from): bool {}
 
-function oci_lob_truncate(OCILob $lob_descriptor, int $length = 0): bool {}
+function oci_lob_truncate(OCILob $lob, int $length = 0): bool {}
 
-function oci_lob_erase(OCILob $lob_descriptor, ?int $offset = null, ?int $length = null): int|false {}
+function oci_lob_erase(OCILob $lob, ?int $offset = null, ?int $length = null): int|false {}
 
-function oci_lob_flush(OCILob $lob_descriptor, int $flag = 0): bool {}
+function oci_lob_flush(OCILob $lob, int $flag = 0): bool {}
 
-function ocisetbufferinglob(OCILob $lob_descriptor, bool $mode): bool {}
+function ocisetbufferinglob(OCILob $lob, bool $mode): bool {}
 
-function ocigetbufferinglob(OCILob $lob_descriptor): bool {}
+function ocigetbufferinglob(OCILob $lob): bool {}
 
-function oci_lob_copy(OCILob $lob_descriptor_to, OCILob $lob_descriptor_from, ?int $length = null): bool {}
+function oci_lob_copy(OCILob $to, OCILob $from, ?int $length = null): bool {}
 
-function oci_lob_is_equal(OCILob $lob_descriptor_first, OCILob $lob_descriptor_second): bool {}
+function oci_lob_is_equal(OCILob $lob1, OCILob $lob2): bool {}
 
-function oci_lob_export(OCILob $lob_descriptor, string $filename, ?int $start = null, ?int $length = null): bool {}
+function oci_lob_export(OCILob $lob, string $filename, ?int $offset = null, ?int $length = null): bool {}
 
 /**
  * @alias oci_lob_export
  * @deprecated
  */
-function ociwritelobtofile(OCILob $lob_descriptor, string $filename, ?int $start = null, ?int $length = null): bool {}
+function ociwritelobtofile(OCILob $lob, string $filename, ?int $offset = null, ?int $length = null): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_new_descriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCILob {}
+/** @param resource $connection */
+function oci_new_descriptor($connection, int $type = OCI_DTYPE_LOB): ?OCILob {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @alias oci_new_descriptor
  * @deprecated
  */
-function ocinewdescriptor($connection_resource, int $type = OCI_DTYPE_LOB): ?OCILob {}
+function ocinewdescriptor($connection, int $type = OCI_DTYPE_LOB): ?OCILob {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_rollback($connection_resource): bool {}
+/** @param resource $connection */
+function oci_rollback($connection): bool {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @alias oci_rollback
  * @deprecated
  */
-function ocirollback($connection_resource): bool {}
+function ocirollback($connection): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_commit($connection_resource): bool {}
+/** @param resource $connection */
+function oci_commit($connection): bool {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @alias oci_commit
  * @deprecated
  */
-function ocicommit($connection_resource): bool {}
+function ocicommit($connection): bool {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_name($statement_resource, string|int $column_number_or_name): string|false {}
+/** @param resource $statement */
+function oci_field_name($statement, string|int $column): string|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_name
  * @deprecated
  */
-function ocicolumnname($statement_resource, string|int $column_number_or_name): string|false {}
+function ocicolumnname($statement, string|int $column): string|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_size($statement_resource, string|int $column_number_or_name): int|false {}
+/** @param resource $statement */
+function oci_field_size($statement, string|int $column): int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_size
  * @deprecated
  */
-function ocicolumnsize($statement_resource, string|int $column_number_or_name): int|false {}
+function ocicolumnsize($statement, string|int $column): int|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_scale($statement_resource, string|int $column_number_or_name): int|false {}
+/** @param resource $statement */
+function oci_field_scale($statement, string|int $column): int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_scale
  * @deprecated
  */
-function ocicolumnscale($statement_resource, string|int $column_number_or_name): int|false {}
+function ocicolumnscale($statement, string|int $column): int|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_precision($statement_resource, string|int $column_number_or_name): int|false {}
+/** @param resource $statement */
+function oci_field_precision($statement, string|int $column): int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_precision
  * @deprecated
  */
-function ocicolumnprecision($statement_resource, string|int $column_number_or_name): int|false {}
+function ocicolumnprecision($statement, string|int $column): int|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_type($statement_resource, string|int $column_number_or_name): string|int|false {}
+/** @param resource $statement */
+function oci_field_type($statement, string|int $column): string|int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_type
  * @deprecated
  */
-function ocicolumntype($statement_resource, string|int $column_number_or_name): string|int|false {}
+function ocicolumntype($statement, string|int $column): string|int|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_type_raw($statement_resource, string|int $column_number_or_name): int|false {}
+/** @param resource $statement */
+function oci_field_type_raw($statement, string|int $column): int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_type_raw
  * @deprecated
  */
-function ocicolumntyperaw($statement_resource, string|int $column_number_or_name): int|false {}
+function ocicolumntyperaw($statement, string|int $column): int|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_field_is_null($statement_resource, string|int $column_number_or_name): bool {}
+/** @param resource $statement */
+function oci_field_is_null($statement, string|int $column): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_field_is_null
  * @deprecated
  */
-function ocicolumnisnull($statement_resource, string|int $column_number_or_name): bool {}
+function ocicolumnisnull($statement, string|int $column): bool {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_execute($statement_resource, int $mode = OCI_COMMIT_ON_SUCCESS): bool {}
+/** @param resource $statement */
+function oci_execute($statement, int $mode = OCI_COMMIT_ON_SUCCESS): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_execute
  * @deprecated
  */
-function ociexecute($statement_resource, int $mode = OCI_COMMIT_ON_SUCCESS): bool {}
+function ociexecute($statement, int $mode = OCI_COMMIT_ON_SUCCESS): bool {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_cancel($statement_resource): bool {}
+/** @param resource $statement */
+function oci_cancel($statement): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_cancel
  * @deprecated
  */
-function ocicancel($statement_resource): bool {}
+function ocicancel($statement): bool {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_fetch($statement_resource): bool {}
+/** @param resource $statement */
+function oci_fetch($statement): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_fetch
  * @deprecated
  */
-function ocifetch($statement_resource): bool {}
+function ocifetch($statement): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @param array $result
  * @deprecated
  */
-function ocifetchinto($statement_resource, &$result, int $mode = OCI_NUM): int|false {}
+function ocifetchinto($statement, &$result, int $mode = OCI_NUM): int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @param array $output
  */
-function oci_fetch_all($statement_resource, &$output, int $skip = 0, int $maximum_rows = -1, int $flags = 0): int {}
+function oci_fetch_all($statement, &$output, int $offset = 0, int $limit = -1, int $flags = 0): int {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @param array $output
  * @alias oci_fetch_all
  * @deprecated
  */
-function ocifetchstatement($statement_resource, &$output, int $skip = 0, int $maximum_rows = -1, int $flags = 0): int {}
+function ocifetchstatement($statement, &$output, int $offset = 0, int $limit = -1, int $flags = 0): int {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_fetch_object($statement_resource, int $mode = PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS): stdClass|null|false {}
+/** @param resource $statement */
+function oci_fetch_object($statement, int $mode = PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS): stdClass|null|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_fetch_row($statement_resource): array|false {}
+/** @param resource $statement */
+function oci_fetch_row($statement): array|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_fetch_assoc($statement_resource): array|false {}
+/** @param resource $statement */
+function oci_fetch_assoc($statement): array|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_fetch_array($statement_resource, int $mode = PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS): array|false {}
+/** @param resource $statement */
+function oci_fetch_array($statement, int $mode = PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS): array|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_free_statement($statement_resource): bool {}
+/** @param resource $statement */
+function oci_free_statement($statement): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_free_statement
  * @deprecated
  */
-function ocifreestatement($statement_resource): bool {}
+function ocifreestatement($statement): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_free_statement
  */
-function oci_free_cursor($statement_resource): bool {}
+function oci_free_cursor($statement): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_free_statement
  * @deprecated
  */
-function ocifreecursor($statement_resource): bool {}
+function ocifreecursor($statement): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_close($connection_resource): ?bool {}
+/** @param resource $connection */
+function oci_close($connection): ?bool {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @alias oci_close
  * @deprecated
  */
-function ocilogoff($connection_resource): ?bool {}
+function ocilogoff($connection): ?bool {}
 
-/**
- * @return resource|false
- */
-function oci_new_connect(string $username, string $password, ?string $connection_string = null, string $character_set = "", int $session_mode = OCI_DEFAULT) {}
+/** @return resource|false */
+function oci_new_connect(string $username, string $password, ?string $dsn = null, string $encoding = "", int $session_mode = OCI_DEFAULT) {}
 
 /**
  * @return resource|false
  * @alias oci_new_connect
  * @deprecated
  */
-function ocinlogon(string $username, string $password, ?string $connection_string = null, string $character_set = "", int $session_mode = OCI_DEFAULT) {}
+function ocinlogon(string $username, string $password, ?string $dsn = null, string $encoding = "", int $session_mode = OCI_DEFAULT) {}
 
 /**
  * @return resource|false
  */
-function oci_connect(string $username, string $password, ?string $connection_string = null, string $character_set = "", int $session_mode = OCI_DEFAULT) {}
+function oci_connect(string $username, string $password, ?string $dsn = null, string $encoding = "", int $session_mode = OCI_DEFAULT) {}
 
 /**
  * @return resource|false
  * @alias oci_connect
  * @deprecated
  */
-function ocilogon(string $username, string $password, ?string $connection_string = null, string $character_set = "", int $session_mode = OCI_DEFAULT) {}
+function ocilogon(string $username, string $password, ?string $dsn = null, string $encoding = "", int $session_mode = OCI_DEFAULT) {}
 
-/**
- * @return resource|false
- */
-function oci_pconnect(string $username, string $password, ?string $connection_string = null, string $character_set = "", int $session_mode = OCI_DEFAULT) {}
+/** @return resource|false */
+function oci_pconnect(string $username, string $password, ?string $dsn = null, string $encoding = "", int $session_mode = OCI_DEFAULT) {}
 
 /**
  * @return resource|false
  * @alias oci_pconnect
  * @deprecated
  */
-function ociplogon(string $username, string $password, ?string $connection_string = null, string $character_set = "", int $session_mode = OCI_DEFAULT) {}
+function ociplogon(string $username, string $password, ?string $dsn = null, string $encoding = "", int $session_mode = OCI_DEFAULT) {}
 
-/**
- * @param resource|null $connection_or_statement_resource
- */
-function oci_error($connection_or_statement_resource = null): array|false {}
+/** @param resource|null $connection_or_statement */
+function oci_error($connection_or_statement = null): array|false {}
 
 /**
- * @param resource|null $connection_or_statement_resource
+ * @param resource|null $connection_or_statement
  * @alias oci_error
  * @deprecated
  */
-function ocierror($connection_or_statement_resource = null): array|false {}
+function ocierror($connection_or_statement = null): array|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_num_fields($statement_resource): int {}
+/** @param resource $statement */
+function oci_num_fields($statement): int {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_num_fields
  * @deprecated
  */
-function ocinumcols($statement_resource): int {}
+function ocinumcols($statement): int {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @return resource|false
  */
-function oci_parse($connection_resource, string $sql_text) {}
+function oci_parse($connection, string $sql) {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @return resource|false
  * @alias oci_parse
  * @deprecated
  */
-function ociparse($connection_resource, string $sql_text) {}
+function ociparse($connection, string $sql) {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @return resource|false
  */
-function oci_get_implicit_resultset($statement_resource) {}
+function oci_get_implicit_resultset($statement) {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_set_prefetch($statement_resource, int $number_of_rows): bool {}
+/** @param resource $statement */
+function oci_set_prefetch($statement, int $rows): bool {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_set_prefetch
  * @deprecated
  */
-function ocisetprefetch($statement_resource, int $number_of_rows): bool {}
+function ocisetprefetch($statement, int $rows): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_set_client_identifier($connection_resource, string $client_identifier): bool {}
+/** @param resource $connection */
+function oci_set_client_identifier($connection, string $client_id): bool {}
 
-function oci_set_edition(string $edition_name): bool {}
+function oci_set_edition(string $edition): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_set_module_name($connection_resource, string $module_name): bool {}
+/** @param resource $connection */
+function oci_set_module_name($connection, string $name): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_set_action($connection_resource, string $action): bool {}
+/** @param resource $connection */
+function oci_set_action($connection, string $action): bool {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  */
-function oci_set_client_info($connection_resource, string $client_information): bool {}
+function oci_set_client_info($connection, string $client_info): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_set_db_operation($connection_resource, string $action): bool {}
+/** @param resource $connection */
+function oci_set_db_operation($connection, string $action): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_set_call_timeout($connection_resource, int $call_timeout): bool {}
+/** @param resource $connection */
+function oci_set_call_timeout($connection, int $timeout): bool {}
 
 /**
- * @param resource|string $connection_resource_or_connection_string
+ * @param resource|string $connection
  * @return resource|bool
  */
-function oci_password_change($connection_resource_or_connection_string, string $username, string $old_password, string $new_password) {}
+function oci_password_change($connection, string $username, string $old_password, string $new_password) {}
 
 /**
- * @param resource|string $connection_resource_or_connection_string
+ * @param resource|string $connection
  * @return resource|bool
  * @alias oci_password_change
  * @deprecated
  */
-function ocipasswordchange($connection_resource_or_connection_string, string $username, string $old_password, string $new_password) {}
+function ocipasswordchange($connection, string $username, string $old_password, string $new_password) {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @return resource|false
  */
-function oci_new_cursor($connection_resource) {}
+function oci_new_cursor($connection) {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @return resource|false
  * @alias oci_new_cursor
  * @deprecated
  */
-function ocinewcursor($connection_resource) {}
+function ocinewcursor($connection) {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_result($statement_resource, string|int $column_number_or_name): mixed {}
+/** @param resource $statement */
+function oci_result($statement, string|int $column): mixed {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_result
  * @deprecated
  */
-function ociresult($statement_resource, string|int $column_number_or_name): mixed {}
+function ociresult($statement, string|int $column): mixed {}
 
 function oci_client_version(): string {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_server_version($connection_resource): string|false {}
+/** @param resource $connection */
+function oci_server_version($connection): string|false {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @alias oci_server_version
  * @deprecated
  */
-function ociserverversion($connection_resource): string|false {}
+function ociserverversion($connection): string|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_statement_type($statement_resource): string|false {}
+/** @param resource $statement */
+function oci_statement_type($statement): string|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_statement_type
  * @deprecated
  */
-function ocistatementtype($statement_resource): string|false {}
+function ocistatementtype($statement): string|false {}
 
-/**
- * @param resource $statement_resource
- */
-function oci_num_rows($statement_resource): int|false {}
+/** @param resource $statement */
+function oci_num_rows($statement): int|false {}
 
 /**
- * @param resource $statement_resource
+ * @param resource $statement
  * @alias oci_num_rows
  * @deprecated
  */
-function ocirowcount($statement_resource): int|false {}
+function ocirowcount($statement): int|false {}
 
 function oci_free_collection(OCICollection $collection): bool {}
 
@@ -555,7 +489,7 @@ function oci_collection_element_get(OCICollection $collection, int $index): stri
  */
 function ocicollgetelem(OCICollection $collection, int $index): string|float|null|false {}
 
-function oci_collection_assign(OCICollection $collection_to, OCICollection $collection_from): bool {}
+function oci_collection_assign(OCICollection $to, OCICollection $from): bool {}
 
 function oci_collection_element_assign(OCICollection $collection, int $index, string $value): bool {}
 
@@ -581,35 +515,29 @@ function oci_collection_max(OCICollection $collection): int|false {}
  */
 function ocicollmax(OCICollection $collection): int|false {}
 
-function oci_collection_trim(OCICollection $collection, int $number): bool {}
+function oci_collection_trim(OCICollection $collection, int $num): bool {}
 
 /**
  * @alias oci_collection_trim
  * @deprecated
  */
-function ocicolltrim(OCICollection $collection, int $number): bool {}
+function ocicolltrim(OCICollection $collection, int $num): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_new_collection($connection_resource, string $type_name, ?string $schema_name = null): OCICollection|false {}
+/** @param resource $connection */
+function oci_new_collection($connection, string $type_name, ?string $schema = null): OCICollection|false {}
 
 /**
- * @param resource $connection_resource
+ * @param resource $connection
  * @alias oci_new_collection
  * @deprecated
  */
-function ocinewcollection($connection_resource, string $type_name, ?string $schema_name = null): OCICollection|false {}
+function ocinewcollection($connection, string $type_name, ?string $schema = null): OCICollection|false {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_register_taf_callback($connection_resource, ?callable $function_name): bool {}
+/** @param resource $connection */
+function oci_register_taf_callback($connection, ?callable $callback): bool {}
 
-/**
- * @param resource $connection_resource
- */
-function oci_unregister_taf_callback($connection_resource): bool {}
+/** @param resource $connection */
+function oci_unregister_taf_callback($connection): bool {}
 
 class OCILob {
     /**
@@ -682,7 +610,7 @@ public function write(string $string, ?int $length = null) {}
      * @alias oci_lob_append
      * @return bool
      */
-    public function append(OCILob $lob_descriptor_from) {}
+    public function append(OCILob $from) {}
 
     /**
      * @alias oci_lob_truncate
@@ -718,13 +646,13 @@ public function getbuffering() {}
      * @alias oci_lob_export
      * @return bool
      */
-    public function writetofile(string $filename, ?int $start = null, ?int $length = null) {}
+    public function writetofile(string $filename, ?int $offset = null, ?int $length = null) {}
 
     /**
      * @alias oci_lob_export
      * @return bool
      */
-    public function export(string $filename, ?int $start = null, ?int $length = null) {}
+    public function export(string $filename, ?int $offset = null, ?int $length = null) {}
 
     /**
      * @alias oci_lob_write_temporary
@@ -768,7 +696,7 @@ public function getElem(int $index) {}
      * @alias oci_collection_assign
      * @return bool
      */
-    public function assign(OCICollection $collection_from) {}
+    public function assign(OCICollection $from) {}
 
     /**
      * @alias oci_collection_element_assign
@@ -792,5 +720,5 @@ public function max() {}
      * @alias oci_collection_trim
      * @return bool
      */
-    public function trim(int $number) {}
+    public function trim(int $num) {}
 }
diff --git a/ext/oci8/oci8_arginfo.h b/ext/oci8/oci8_arginfo.h
index bd6c7bc310d60..cc38b9340a863 100644
--- a/ext/oci8/oci8_arginfo.h
+++ b/ext/oci8/oci8_arginfo.h
@@ -1,42 +1,42 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 154cd2128ba63d5d361b1f2f6ff55ae1659c59b9 */
+ * Stub hash: 0a2d5b01c4175070da5d0355151e6b6f71e739ce */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_define_by_name, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_INFO(0, column_name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(1, variable, IS_MIXED, 0)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_INFO(0, column, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocidefinebyname arginfo_oci_define_by_name
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_bind_by_name, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_INFO(0, column_name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(1, variable, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maximum_length, IS_LONG, 0, "-1")
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_INFO(0, param, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_length, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocibindbyname arginfo_oci_bind_by_name
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_bind_array_by_name, 0, 4, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_INFO(0, column_name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(1, variable, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO(0, maximum_array_length, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maximum_item_length, IS_LONG, 0, "-1")
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_INFO(0, param, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(1, var, IS_MIXED, 0)
+	ZEND_ARG_TYPE_INFO(0, max_array_length, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max_item_length, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "SQLT_AFC")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_free_descriptor, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocifreedesc arginfo_oci_free_descriptor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_save, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
@@ -44,33 +44,33 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocisavelob arginfo_oci_lob_save
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_import, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocisavelobfile arginfo_oci_lob_import
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_load, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ociloadlob arginfo_oci_lob_load
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_read, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_oci_lob_eof arginfo_oci_free_descriptor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_tell, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_oci_lob_rewind arginfo_oci_free_descriptor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_seek, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whence, IS_LONG, 0, "OCI_SEEK_SET")
 ZEND_END_ARG_INFO()
@@ -78,68 +78,68 @@ ZEND_END_ARG_INFO()
 #define arginfo_oci_lob_size arginfo_oci_lob_tell
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_write, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
-	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_append, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_to, OCILob, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, to, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, from, OCILob, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_truncate, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_lob_erase, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_flush, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flag, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ocisetbufferinglob, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocigetbufferinglob arginfo_oci_free_descriptor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_copy, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_to, OCILob, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, to, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, from, OCILob, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_is_equal, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_first, OCILob, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_second, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob1, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob2, OCILob, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_lob_export, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, lob, OCILob, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ociwritelobtofile arginfo_oci_lob_export
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_oci_new_descriptor, 0, 1, OCILob, 1)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "OCI_DTYPE_LOB")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocinewdescriptor arginfo_oci_new_descriptor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_rollback, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocirollback arginfo_oci_rollback
@@ -149,15 +149,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocicommit arginfo_oci_rollback
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_field_name, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_MASK(0, column_number_or_name, MAY_BE_STRING|MAY_BE_LONG, NULL)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocicolumnname arginfo_oci_field_name
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_field_size, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_MASK(0, column_number_or_name, MAY_BE_STRING|MAY_BE_LONG, NULL)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocicolumnsize arginfo_oci_field_size
@@ -171,8 +171,8 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocicolumnprecision arginfo_oci_field_size
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_field_type, 0, 2, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_MASK(0, column_number_or_name, MAY_BE_STRING|MAY_BE_LONG, NULL)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocicolumntype arginfo_oci_field_type
@@ -182,21 +182,21 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocicolumntyperaw arginfo_oci_field_size
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_field_is_null, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_MASK(0, column_number_or_name, MAY_BE_STRING|MAY_BE_LONG, NULL)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocicolumnisnull arginfo_oci_field_is_null
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_execute, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_COMMIT_ON_SUCCESS")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ociexecute arginfo_oci_execute
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_cancel, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocicancel arginfo_oci_cancel
@@ -206,34 +206,34 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocifetch arginfo_oci_cancel
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ocifetchinto, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 	ZEND_ARG_INFO(1, result)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "OCI_NUM")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_fetch_all, 0, 2, IS_LONG, 0)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 	ZEND_ARG_INFO(1, output)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, skip, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maximum_rows, IS_LONG, 0, "-1")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, limit, IS_LONG, 0, "-1")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocifetchstatement arginfo_oci_fetch_all
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_fetch_object, 0, 1, stdClass, MAY_BE_NULL|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_fetch_row, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #define arginfo_oci_fetch_assoc arginfo_oci_fetch_row
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_fetch_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS")
 ZEND_END_ARG_INFO()
 
@@ -246,7 +246,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocifreecursor arginfo_oci_cancel
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_close, 0, 1, _IS_BOOL, 1)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocilogoff arginfo_oci_close
@@ -254,8 +254,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_connect, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, connection_string, IS_STRING, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, character_set, IS_STRING, 0, "\"\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dsn, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 0, "\"\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, session_mode, IS_LONG, 0, "OCI_DEFAULT")
 ZEND_END_ARG_INFO()
 
@@ -270,68 +270,68 @@ ZEND_END_ARG_INFO()
 #define arginfo_ociplogon arginfo_oci_new_connect
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_error, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection_or_statement_resource, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection_or_statement, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocierror arginfo_oci_error
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_num_fields, 0, 1, IS_LONG, 0)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocinumcols arginfo_oci_num_fields
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_parse, 0, 0, 2)
-	ZEND_ARG_INFO(0, connection_resource)
-	ZEND_ARG_TYPE_INFO(0, sql_text, IS_STRING, 0)
+	ZEND_ARG_INFO(0, connection)
+	ZEND_ARG_TYPE_INFO(0, sql, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ociparse arginfo_oci_parse
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_get_implicit_resultset, 0, 0, 1)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_prefetch, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_INFO(0, number_of_rows, IS_LONG, 0)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_INFO(0, rows, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocisetprefetch arginfo_oci_set_prefetch
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_client_identifier, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
-	ZEND_ARG_TYPE_INFO(0, client_identifier, IS_STRING, 0)
+	ZEND_ARG_INFO(0, connection)
+	ZEND_ARG_TYPE_INFO(0, client_id, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_edition, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, edition_name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, edition, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_module_name, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
-	ZEND_ARG_TYPE_INFO(0, module_name, IS_STRING, 0)
+	ZEND_ARG_INFO(0, connection)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_action, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 	ZEND_ARG_TYPE_INFO(0, action, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_client_info, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
-	ZEND_ARG_TYPE_INFO(0, client_information, IS_STRING, 0)
+	ZEND_ARG_INFO(0, connection)
+	ZEND_ARG_TYPE_INFO(0, client_info, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_oci_set_db_operation arginfo_oci_set_action
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_set_call_timeout, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
-	ZEND_ARG_TYPE_INFO(0, call_timeout, IS_LONG, 0)
+	ZEND_ARG_INFO(0, connection)
+	ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_password_change, 0, 0, 4)
-	ZEND_ARG_INFO(0, connection_resource_or_connection_string)
+	ZEND_ARG_INFO(0, connection)
 	ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, old_password, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, new_password, IS_STRING, 0)
@@ -340,14 +340,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocipasswordchange arginfo_oci_password_change
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_cursor, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocinewcursor arginfo_oci_new_cursor
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_result, 0, 2, IS_MIXED, 0)
-	ZEND_ARG_INFO(0, statement_resource)
-	ZEND_ARG_TYPE_MASK(0, column_number_or_name, MAY_BE_STRING|MAY_BE_LONG, NULL)
+	ZEND_ARG_INFO(0, statement)
+	ZEND_ARG_TYPE_MASK(0, column, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ociresult arginfo_oci_result
@@ -356,19 +356,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_client_version, 0, 0, IS_STR
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_server_version, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ociserverversion arginfo_oci_server_version
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_statement_type, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocistatementtype arginfo_oci_statement_type
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_oci_num_rows, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, statement_resource)
+	ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocirowcount arginfo_oci_num_rows
@@ -394,8 +394,8 @@ ZEND_END_ARG_INFO()
 #define arginfo_ocicollgetelem arginfo_oci_collection_element_get
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_assign, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, collection_to, OCICollection, 0)
-	ZEND_ARG_OBJ_INFO(0, collection_from, OCICollection, 0)
+	ZEND_ARG_OBJ_INFO(0, to, OCICollection, 0)
+	ZEND_ARG_OBJ_INFO(0, from, OCICollection, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_element_assign, 0, 3, _IS_BOOL, 0)
@@ -418,22 +418,22 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_collection_trim, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, collection, OCICollection, 0)
-	ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, num, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocicolltrim arginfo_oci_collection_trim
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_oci_new_collection, 0, 2, OCICollection, MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, connection_resource)
+	ZEND_ARG_INFO(0, connection)
 	ZEND_ARG_TYPE_INFO(0, type_name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema_name, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_ocinewcollection arginfo_oci_new_collection
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_oci_register_taf_callback, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_INFO(0, connection_resource)
-	ZEND_ARG_TYPE_INFO(0, function_name, IS_CALLABLE, 1)
+	ZEND_ARG_INFO(0, connection)
+	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1)
 ZEND_END_ARG_INFO()
 
 #define arginfo_oci_unregister_taf_callback arginfo_oci_rollback
@@ -475,7 +475,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_write, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_append, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, lob_descriptor_from, OCILob, 0)
+	ZEND_ARG_OBJ_INFO(0, from, OCILob, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_truncate, 0, 0, 0)
@@ -499,7 +499,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCILob_writetofile, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -525,7 +525,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_getElem, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_assign, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, collection_from, OCICollection, 0)
+	ZEND_ARG_OBJ_INFO(0, from, OCICollection, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_assignelem, 0, 0, 2)
@@ -538,7 +538,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_OCICollection_max arginfo_class_OCILob_load
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_OCICollection_trim, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, num, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt
index 863f543c0f5a4..aa0def13d23ab 100644
--- a/ext/oci8/tests/array_bind_002.phpt
+++ b/ext/oci8/tests/array_bind_002.phpt
@@ -63,7 +63,7 @@ var_dump($array);
 echo "Done\n";
 ?>
 --EXPECTF--
-oci_bind_array_by_name(): Argument #4 ($maximum_array_length) must be greater than 0
+oci_bind_array_by_name(): Argument #4 ($max_array_length) must be greater than 0
 
 Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
 array(5) {
diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt
index 20282d16878a3..b2d3267ecedec 100644
--- a/ext/oci8/tests/conn_attr_4.phpt
+++ b/ext/oci8/tests/conn_attr_4.phpt
@@ -90,10 +90,10 @@ echo "Done\n";
 **Test  Negative cases************
 
 Invalid Connection resource 1
-string(89) "oci_set_action(): Argument #1 ($connection_resource) must be of type resource, null given"
+string(89) "oci_set_action(): Argument #1 ($connection) must be of type resource, null given"
 
 Invalid Connection resource 2
-string(96) "oci_set_client_info(): Argument #1 ($connection_resource) must be of type resource, string given"
+string(96) "oci_set_client_info(): Argument #1 ($connection) must be of type resource, string given"
 
 Invalid Action value 
 string(78) "oci_set_action(): Argument #2 ($action) must be of type string, resource given"
diff --git a/ext/oci8/tests/define1.phpt b/ext/oci8/tests/define1.phpt
index e79fd76e1b9bd..b5daf7a4b13fb 100644
--- a/ext/oci8/tests/define1.phpt
+++ b/ext/oci8/tests/define1.phpt
@@ -52,6 +52,6 @@ echo "Done\n";
 --EXPECTF--
 bool(true)
 bool(false)
-oci_define_by_name(): Argument #2 ($column_name) cannot be empty
+oci_define_by_name(): Argument #2 ($column) cannot be empty
 string(4) "some"
 Done
diff --git a/ext/oci8/tests/refcur_prefetch_1.phpt b/ext/oci8/tests/refcur_prefetch_1.phpt
index 5f8fe821d40a6..c6d830506c102 100644
--- a/ext/oci8/tests/refcur_prefetch_1.phpt
+++ b/ext/oci8/tests/refcur_prefetch_1.phpt
@@ -223,9 +223,9 @@ NULL
 -----------------------------------------------
 Test with Prefetch (invalid) value set to -12345 
 -----------------------------------------------
-oci_set_prefetch(): Argument #2 ($number_of_rows) must be greater than or equal to 0
+oci_set_prefetch(): Argument #2 ($rows) must be greater than or equal to 0
 -----------------------------------------------
 Test with Prefetch (invalid) value set to -1 
 -----------------------------------------------
-oci_set_prefetch(): Argument #2 ($number_of_rows) must be greater than or equal to 0
+oci_set_prefetch(): Argument #2 ($rows) must be greater than or equal to 0
 Done