New upstream version 5.6.0~beta1+dfsgupstream/5.6.0_beta1+dfsg

25 files changed, 123 insertions, 123 deletions

diff --git a/ext/oci8/tests/array_bind_001.phpt b/ext/oci8/tests/array_bind_001.phpt
index 6a3746c2d..0c1644152 100644
--- a/ext/oci8/tests/array_bind_001.phpt
+++ b/ext/oci8/tests/array_bind_001.phpt
@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_001_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_001_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_001_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_001_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_001_pkg.iobind(:c1); END;");
 
 $array = "";
 
diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt
index 82b57dc73..d2b520c78 100644
--- a/ext/oci8/tests/array_bind_002.phpt
+++ b/ext/oci8/tests/array_bind_002.phpt
@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_002_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_002_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_002_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_002_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_002_pkg.iobind(:c1); END;");
 
 $array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
 
diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt
index 0875c694f..eee150020 100644
--- a/ext/oci8/tests/array_bind_003.phpt
+++ b/ext/oci8/tests/array_bind_003.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_003_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_003_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_003_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_003_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_003_pkg.iobind(:c1); END;");
 
 $array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17");
 
@@ -63,7 +63,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 Warning: oci_execute(): ORA-01403: %s
-ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d
+ORA-06512: at "SYSTEM.ARRAY_BIND_003_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_003.php on line %d
 array(4) {
   [0]=>
diff --git a/ext/oci8/tests/array_bind_004.phpt b/ext/oci8/tests/array_bind_004.phpt
index df74025d7..a998a2225 100644
--- a/ext/oci8/tests/array_bind_004.phpt
+++ b/ext/oci8/tests/array_bind_004.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_004_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_004_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_004_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_004_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_004_pkg.iobind(:c1); END;");
 
 $array = Array();
 
@@ -63,7 +63,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 Warning: oci_execute(): ORA-01403: %s
-ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d
+ORA-06512: at "SYSTEM.ARRAY_BIND_004_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_004.php on line %d
 array(0) {
 }
diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt
index eaa3c4ea2..4a73e0ffc 100644
--- a/ext/oci8/tests/array_bind_005.phpt
+++ b/ext/oci8/tests/array_bind_005.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_005_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_005_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_005_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_005_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_005_pkg.iobind(:c1); END;");
 
 $array = Array("", "", "", "", "");
 
diff --git a/ext/oci8/tests/array_bind_006.phpt b/ext/oci8/tests/array_bind_006.phpt
index f13aca399..cc24c2bd8 100644
--- a/ext/oci8/tests/array_bind_006.phpt
+++ b/ext/oci8/tests/array_bind_006.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_006_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_006_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_006_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_006_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_006_pkg.iobind(:c1); END;");
 
 $array = array("one", "two", "three", "four", "five");
 
diff --git a/ext/oci8/tests/array_bind_007.phpt b/ext/oci8/tests/array_bind_007.phpt
index c926bc0ab..6c9101b68 100644
--- a/ext/oci8/tests/array_bind_007.phpt
+++ b/ext/oci8/tests/array_bind_007.phpt
@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_007_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_007_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_007_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_007_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_007_pkg.iobind(:c1); END;");
 
 $array = Array(1,2,3,4,5);
 
diff --git a/ext/oci8/tests/array_bind_008.phpt b/ext/oci8/tests/array_bind_008.phpt
index df2c35ccb..393316c22 100644
--- a/ext/oci8/tests/array_bind_008.phpt
+++ b/ext/oci8/tests/array_bind_008.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_008_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_008_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_008_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_008_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_008_pkg.iobind(:c1); END;");
 
 $array = Array(1,2,3,4,5);
 
diff --git a/ext/oci8/tests/array_bind_011.phpt b/ext/oci8/tests/array_bind_011.phpt
index 9f43d1ac9..4c27bd06e 100644
--- a/ext/oci8/tests/array_bind_011.phpt
+++ b/ext/oci8/tests/array_bind_011.phpt
@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_011_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_011_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_011_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_011_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_011_pkg.iobind(:c1); END;");
 
 $array = array();
 
diff --git a/ext/oci8/tests/array_bind_014.phpt b/ext/oci8/tests/array_bind_014.phpt
index 9ab023635..8d9a21b69 100644
--- a/ext/oci8/tests/array_bind_014.phpt
+++ b/ext/oci8/tests/array_bind_014.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_014_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_014_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_014_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,7 +42,7 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_014_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
@@ -51,7 +51,7 @@ for ($i = 1; $i < 6; $i++) {
 	oci_execute($statement);
 }
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_014_pkg.iobind(:c1); END;");
 $array = Array();
 oci_bind_array_by_name($statement, ":c1", $array, 5, -1, SQLT_INT);
 oci_execute($statement);
diff --git a/ext/oci8/tests/array_bind_bdouble.phpt b/ext/oci8/tests/array_bind_bdouble.phpt
index fb173654b..ba8ffe978 100644
--- a/ext/oci8/tests/array_bind_bdouble.phpt
+++ b/ext/oci8/tests/array_bind_bdouble.phpt
@@ -11,7 +11,7 @@ if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older
 
 require dirname(__FILE__).'/connect.inc';
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_bdouble_pkg.iobind(:c1); END;");
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_BDOUBLE);
 
diff --git a/ext/oci8/tests/array_bind_bfloat.phpt b/ext/oci8/tests/array_bind_bfloat.phpt
index fdd43958c..afbcce38d 100644
--- a/ext/oci8/tests/array_bind_bfloat.phpt
+++ b/ext/oci8/tests/array_bind_bfloat.phpt
@@ -11,7 +11,7 @@ if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older O
 
 require dirname(__FILE__).'/connect.inc';
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_bfloat_pkg.iobind(:c1); END;");
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_BFLOAT);
 
diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt
index 926d7cfab..6a077b10b 100644
--- a/ext/oci8/tests/array_bind_date.phpt
+++ b/ext/oci8/tests/array_bind_date.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_DATE_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_DATE_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_DATE_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_DATE_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_date_pkg.iobind(:c1); END;");
 
 $array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
 
diff --git a/ext/oci8/tests/array_bind_date1.phpt b/ext/oci8/tests/array_bind_date1.phpt
index c8c1f1a5e..d8ecdb5a4 100644
--- a/ext/oci8/tests/array_bind_date1.phpt
+++ b/ext/oci8/tests/array_bind_date1.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_DATE1_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_DATE1_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_DATE1_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_DATE1_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_date1_pkg.iobind(:c1); END;");
 
 $array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
 
diff --git a/ext/oci8/tests/array_bind_float.phpt b/ext/oci8/tests/array_bind_float.phpt
index 5246f6380..b35ca3de0 100644
--- a/ext/oci8/tests/array_bind_float.phpt
+++ b/ext/oci8/tests/array_bind_float.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_FLOAT_PKG AS 
   TYPE ARRTYPE IS TABLE OF FLOAT INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_FLOAT_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_FLOAT_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_FLOAT_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_float_pkg.iobind(:c1); END;");
 
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 
diff --git a/ext/oci8/tests/array_bind_float1.phpt b/ext/oci8/tests/array_bind_float1.phpt
index 53b551f1c..7f755aa84 100644
--- a/ext/oci8/tests/array_bind_float1.phpt
+++ b/ext/oci8/tests/array_bind_float1.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_FLOAT1_PKG AS 
   TYPE ARRTYPE IS TABLE OF FLOAT INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_FLOAT1_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_FLOAT1_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_FLOAT1_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_float1_pkg.iobind(:c1); END;");
 
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 
diff --git a/ext/oci8/tests/array_bind_int.phpt b/ext/oci8/tests/array_bind_int.phpt
index 2f34979f2..e4fc6676d 100644
--- a/ext/oci8/tests/array_bind_int.phpt
+++ b/ext/oci8/tests/array_bind_int.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_INT_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_INT_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_INT_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_INT_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_int_pkg.iobind(:c1); END;");
 
 $array = Array(1,2,3,4,5);
 
diff --git a/ext/oci8/tests/array_bind_int1.phpt b/ext/oci8/tests/array_bind_int1.phpt
index 49fea2aa0..6590e2fb3 100644
--- a/ext/oci8/tests/array_bind_int1.phpt
+++ b/ext/oci8/tests/array_bind_int1.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_INT1_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_INT1_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_INT1_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_INT1_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_int1_pkg.iobind(:c1); END;");
 
 $array = Array(1,2,3,4,5);
 
diff --git a/ext/oci8/tests/array_bind_str.phpt b/ext/oci8/tests/array_bind_str.phpt
index 87291bd17..84bcb4875 100644
--- a/ext/oci8/tests/array_bind_str.phpt
+++ b/ext/oci8/tests/array_bind_str.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_STR_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_STR_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_STR_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_STR_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_str_pkg.iobind(:c1); END;");
 
 $array = Array("one", "two", "three", "four", "five");
 
diff --git a/ext/oci8/tests/array_bind_str1.phpt b/ext/oci8/tests/array_bind_str1.phpt
index 3f60ee8c2..ab35ad79b 100644
--- a/ext/oci8/tests/array_bind_str1.phpt
+++ b/ext/oci8/tests/array_bind_str1.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_STR1_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_STR1_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_STR1_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_STR1_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_str1_pkg.iobind(:c1); END;");
 
 $array = Array("one", "two", "three", "four", "five");
 
diff --git a/ext/oci8/tests/array_bind_uin.phpt b/ext/oci8/tests/array_bind_uin.phpt
index 3ce039e0d..0b9e98259 100644
--- a/ext/oci8/tests/array_bind_uin.phpt
+++ b/ext/oci8/tests/array_bind_uin.phpt
@@ -10,7 +10,7 @@ require(dirname(__FILE__).'/skipif.inc');
 
 require dirname(__FILE__).'/connect.inc';
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_uin_pkg.iobind(:c1); END;");
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_UIN);
 
diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt
index 1c00f68d3..a1eeafc76 100644
--- a/ext/oci8/tests/bug37581.phpt
+++ b/ext/oci8/tests/bug37581.phpt
@@ -10,19 +10,19 @@ require(dirname(__FILE__).'/skipif.inc');
 
 require dirname(__FILE__)."/connect.inc";
 
-$p1 = "create or replace package ARRAYBINDPKG1 as
+$p1 = "create or replace package BUG37581_PKG as
 type str_array is table of char(2) index by binary_integer;
 procedure array_bind(in_str in str_array, out_str out string);
-end ARRAYBINDPKG1;";
+end BUG37581_PKG;";
 
-$p2 = "create or replace package body ARRAYBINDPKG1 as
+$p2 = "create or replace package body BUG37581_PKG as
   procedure array_bind(in_str in str_array, out_str out string) is
   begin
     for i in 1 .. in_str.count loop
       out_str := in_str(i);
     end loop;
   end array_bind;
-end ARRAYBINDPKG1;";
+end BUG37581_PKG;";
 
 $s1 = oci_parse($c, $p1);
 $s2 = oci_parse($c, $p2);
@@ -30,7 +30,7 @@ oci_execute($s1);
 oci_execute($s2);
 
 
-$stmt           = oci_parse($c,'begin ARRAYBINDPKG1.array_bind(:in_arr, :out_str); end;');
+$stmt           = oci_parse($c,'begin bug37581_pkg.array_bind(:in_arr, :out_str); end;');
 $strings        = array('A','B','C','D','E');
 
 oci_bind_array_by_name($stmt,':in_arr',$strings,5,1,SQLT_AFC);
diff --git a/ext/oci8/tests/bug40078.phpt b/ext/oci8/tests/bug40078.phpt
index 4070221ee..d9b54e295 100644
--- a/ext/oci8/tests/bug40078.phpt
+++ b/ext/oci8/tests/bug40078.phpt
@@ -11,15 +11,15 @@ require(dirname(__FILE__).'/skipif.inc');
 require dirname(__FILE__).'/connect.inc';
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS
+CREATE OR REPLACE PACKAGE BUG40078_PKG AS
     TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER;
     PROCEDURE nullbind(c1 OUT ARRTYPE);
-END ARRAYBINDPKG1;";
+END BUG40078_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
+CREATE OR REPLACE PACKAGE BODY BUG40078_PKG AS
     PROCEDURE nullbind(c1 OUT ARRTYPE) IS
     BEGIN
         c1(1) := 'one';
@@ -28,11 +28,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
         c1(4) := 'four';
         c1(5) := 'five';
     END nullbind;
-END ARRAYBINDPKG1;";
+END BUG40078_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.nullbind(:c1); END;");
+$statement = oci_parse($c, "BEGIN bug40078_pkg.nullbind(:c1); END;");
 
 oci_bind_array_by_name($statement, ":c1", $array, 5, 20, SQLT_CHR);
 
diff --git a/ext/oci8/tests/bug51253.phpt b/ext/oci8/tests/bug51253.phpt
index a97272f65..111da929b 100644
--- a/ext/oci8/tests/bug51253.phpt
+++ b/ext/oci8/tests/bug51253.phpt
@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BUG51253_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END BUG51253_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY BUG51253_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,12 +45,12 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END BUG51253_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
 echo "Test 1\n";
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN bug51253_pkg.iobind(:c1); END;");
 $array1 = array("one", "two", "three", "four", "five");
 $array2 = $array1;
 oci_bind_array_by_name($statement, ":c1", $array2, 5, -1, SQLT_CHR);
@@ -61,7 +61,7 @@ var_dump($array2);
 
 
 echo "Test 2\n";
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN bug51253_pkg.iobind(:c1); END;");
 $array1 = array("one", "two", "three", "four", "five");
 $array2 = &$array1;
 oci_bind_array_by_name($statement, ":c1", $array2, 5, -1, SQLT_CHR);
@@ -72,7 +72,7 @@ var_dump($array2);
 
 
 echo "Test 3\n";
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN bug51253_pkg.iobind(:c1); END;");
 $array1 = array("one", "two", "three", "four", "five");
 $array2 = &$array1;
 oci_bind_array_by_name($statement, ":c1", $array1, 5, -1, SQLT_CHR);
@@ -82,7 +82,7 @@ var_dump($array1);
 var_dump($array2);
 
 // Cleanup
-$statement = oci_parse($c, "DROP PACKAGE ARRAYBINDPKG1");
+$statement = oci_parse($c, "DROP PACKAGE BUG51253_PKG");
 @oci_execute($statement);
 $statement = oci_parse($c, "DROP TABLE BIND_TEST");
 @oci_execute($statement);
diff --git a/ext/oci8/tests/reflection1.phpt b/ext/oci8/tests/reflection1.phpt
index f76d7261a..2cf3e4055 100644
--- a/ext/oci8/tests/reflection1.phpt
+++ b/ext/oci8/tests/reflection1.phpt
@@ -177,7 +177,7 @@ Function [ <internal%s> function oci_field_name ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -193,7 +193,7 @@ Function [ <internal%s> function oci_field_scale ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -201,7 +201,7 @@ Function [ <internal%s> function oci_field_precision ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -209,7 +209,7 @@ Function [ <internal%s> function oci_field_type ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -217,7 +217,7 @@ Function [ <internal%s> function oci_field_type_raw ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -722,7 +722,7 @@ Function [ <internal%s> function ocicolumnname ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -738,7 +738,7 @@ Function [ <internal%s> function ocicolumnscale ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -746,7 +746,7 @@ Function [ <internal%s> function ocicolumnprecision ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -754,7 +754,7 @@ Function [ <internal%s> function ocicolumntype ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }
 
@@ -762,7 +762,7 @@ Function [ <internal%s> function ocicolumntyperaw ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $statement_resource ]
-    Parameter #1 [ <required> $column_number ]
+    Parameter #1 [ <required> $column_number_or_name ]
   }
 }