14 files changed, 20 insertions, 20 deletions
diff --git a/Zend/tests/bug42859.phpt b/Zend/tests/bug42859.phpt
index 6464f9b4c7..475c583465 100755
--- a/Zend/tests/bug42859.phpt
+++ b/Zend/tests/bug42859.phpt
@@ -5,8 +5,8 @@ Bug #42859 import always conflicts with internal classes
 namespace Foo;
 class Ex {}
 
-import Blah::Exception;
-import Blah::Ex;
+use Blah::Exception;
+use Blah::Ex;
 ?>
 --EXPECTF--
 Fatal error: Import name 'Ex' conflicts with defined class in %sbug42859.php on line 6
 \ No newline at end of file
diff --git a/Zend/tests/ns_002.phpt b/Zend/tests/ns_002.phpt
index 4b17012a94..7faca97cd3 100755
--- a/Zend/tests/ns_002.phpt
+++ b/Zend/tests/ns_002.phpt
@@ -10,9 +10,9 @@ class Foo {
   }
 }
 
-import test::ns1::Foo as Bar;
-import test::ns1 as ns2;
-import test::ns1;
+use test::ns1::Foo as Bar;
+use test::ns1 as ns2;
+use test::ns1;
 
 Foo::bar();
 test::ns1::Foo::bar();
diff --git a/Zend/tests/ns_010.phpt b/Zend/tests/ns_010.phpt
index 7be99e49bf..95172e0ec3 100755
--- a/Zend/tests/ns_010.phpt
+++ b/Zend/tests/ns_010.phpt
@@ -3,7 +3,7 @@
 --FILE--
 <?php
 namespace X;
-import X as Y;
+use X as Y;
 class Foo {	
 	const C = "const ok\n";
 	static $var = "var ok\n";
diff --git a/Zend/tests/ns_012.phpt b/Zend/tests/ns_012.phpt
index aa50661e79..ce16db1ab9 100755
--- a/Zend/tests/ns_012.phpt
+++ b/Zend/tests/ns_012.phpt
@@ -8,8 +8,8 @@ function foo() {
   echo __FUNCTION__,"\n";
 }
 
-import test::ns1 as ns2;
-import test as ns3;
+use test::ns1 as ns2;
+use test as ns3;
 
 foo();
 bar();
diff --git a/Zend/tests/ns_020.phpt b/Zend/tests/ns_020.phpt
index 32325e09d2..9d2e8a7ccb 100755
--- a/Zend/tests/ns_020.phpt
+++ b/Zend/tests/ns_020.phpt
@@ -3,7 +3,7 @@
 --FILE--
 <?php
 namespace X;
-import X as Y;
+use X as Y;
 function foo() {
 	echo __FUNCTION__,"\n";
 }
diff --git a/Zend/tests/ns_022.phpt b/Zend/tests/ns_022.phpt
index f46a856d01..6944ca403f 100755
--- a/Zend/tests/ns_022.phpt
+++ b/Zend/tests/ns_022.phpt
@@ -4,7 +4,7 @@
 <?php
 namespace a::b::c;
 
-import a::b::c as test;
+use a::b::c as test;
 
 require "ns_022.inc";
 
diff --git a/Zend/tests/ns_029.phpt b/Zend/tests/ns_029.phpt
index a76f4fa9cd..1b82b052e5 100755
--- a/Zend/tests/ns_029.phpt
+++ b/Zend/tests/ns_029.phpt
@@ -2,7 +2,7 @@
 029: Name ambiguity (class name & import name)
 --FILE--
 <?php
-import A::B as Foo;
+use A::B as Foo;
 
 class Foo {
 }
diff --git a/Zend/tests/ns_030.phpt b/Zend/tests/ns_030.phpt
index c87b293bb6..83a86b1fd1 100755
--- a/Zend/tests/ns_030.phpt
+++ b/Zend/tests/ns_030.phpt
@@ -5,7 +5,7 @@
 class Foo {
 }
 
-import A::B as Foo;
+use A::B as Foo;
 
 new Foo();
 --EXPECTF--
diff --git a/Zend/tests/ns_033.phpt b/Zend/tests/ns_033.phpt
index bd0bebd4bd..dc431d82b9 100755
--- a/Zend/tests/ns_033.phpt
+++ b/Zend/tests/ns_033.phpt
@@ -2,7 +2,7 @@
 033: Import statement with non-compound name
 --FILE--
 <?php
-import A;
+use A;
 --EXPECTF--
-Warning: The import statement with non-compound name 'A' has no effect in %sns_033.php on line 2
+Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2
 
diff --git a/Zend/tests/ns_034.phpt b/Zend/tests/ns_034.phpt
index a0424a9997..f8669cfb74 100755
--- a/Zend/tests/ns_034.phpt
+++ b/Zend/tests/ns_034.phpt
@@ -3,7 +3,7 @@
 --FILE--
 <?php
 namespace A;
-import A as B;
+use A as B;
 class Foo {
 	const C = "ok\n";
 }
diff --git a/Zend/tests/ns_036.phpt b/Zend/tests/ns_036.phpt
index 9825c8fc1f..6fee2cb006 100755
--- a/Zend/tests/ns_036.phpt
+++ b/Zend/tests/ns_036.phpt
@@ -5,7 +5,7 @@
 --FILE--
 <?php
 namespace A;
-import A as B;
+use A as B;
 class ArrayObject {
 	const STD_PROP_LIST = 2;
 }
diff --git a/Zend/tests/ns_037.phpt b/Zend/tests/ns_037.phpt
index 4e6c248546..ed36e0bb57 100755
--- a/Zend/tests/ns_037.phpt
+++ b/Zend/tests/ns_037.phpt
@@ -3,7 +3,7 @@
 --FILE--
 <?php
 namespace X;
-import X as Y;
+use X as Y;
 class X {
 	const C = "const ok\n";
 	static $var = "var ok\n";
diff --git a/Zend/tests/ns_040.phpt b/Zend/tests/ns_040.phpt
index 11799f9a73..f017aff0bd 100644
--- a/Zend/tests/ns_040.phpt
+++ b/Zend/tests/ns_040.phpt
@@ -3,7 +3,7 @@
 --FILE--
 <?php
 namespace X;
-import X as Y;
+use X as Y;
 const A = "ok\n";
 const B = A;
 const C = array(A);
diff --git a/Zend/tests/ns_042.phpt b/Zend/tests/ns_042.phpt
index bda697bff9..eecd5f9256 100644
--- a/Zend/tests/ns_042.phpt
+++ b/Zend/tests/ns_042.phpt
@@ -6,8 +6,8 @@ namespace test::ns1;
 
 const FOO = "ok\n";
 
-import test::ns1 as ns2;
-import test as ns3;
+use test::ns1 as ns2;
+use test as ns3;
 
 echo FOO;
 echo test::ns1::FOO;