diff --git a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/Test.as b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/Test.as
index 2efce30f9..b69bbbc2b 100644
--- a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/Test.as
+++ b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/Test.as
@@ -9,7 +9,7 @@ import flash.display.MovieClip;
 public class Test extends MovieClip {}
 }
 
-import UserDefinedErrorsPackageWithoutMatchingCatch.*;
+import testpackage.*;
 
 // var SECTION = "Definitions";           // provide a document reference (ie, ECMA section)
 // var VERSION = "AS3";                   // Version of JavaScript or ECMA
diff --git a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch/TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch.as b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage/TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch.as
similarity index 92%
rename from tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch/TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch.as
rename to tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage/TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch.as
index f7d8e336c..3fa371019 100644
--- a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch/TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch.as
+++ b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage/TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch.as
@@ -1,9 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package UserDefinedErrorsPackageWithoutMatchingCatch{
+package testpackage {
 
-     import UserDefinedErrorsPackageWithoutMatchingCatch2.*;
+     import testpackage2.*;
 import com.adobe.test.Assert;
      public class TryAndCatchBlockWithUserDefinedErrorsWithoutMatchingcatch
      {
diff --git a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/Box.as b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/Box.as
similarity index 93%
rename from tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/Box.as
rename to tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/Box.as
index b8fd0ced3..80b4c8c33 100644
--- a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/Box.as
+++ b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/Box.as
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package UserDefinedErrorsPackageWithoutMatchingCatch2
+package testpackage2
 {
 public class Box
 {
diff --git a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxDimensionException.as b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxDimensionException.as
similarity index 86%
rename from tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxDimensionException.as
rename to tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxDimensionException.as
index 3adeddd16..2b0b3b94b 100644
--- a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxDimensionException.as
+++ b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxDimensionException.as
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package UserDefinedErrorsPackageWithoutMatchingCatch2 {
+package testpackage2 {
 
 public class BoxDimensionException extends Error {
   public function BoxDimensionException(boxErrMsg: String) {
diff --git a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxOverflowException.as b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxOverflowException.as
similarity index 86%
rename from tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxOverflowException.as
rename to tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxOverflowException.as
index 44000d357..e13293155 100644
--- a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxOverflowException.as
+++ b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxOverflowException.as
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package UserDefinedErrorsPackageWithoutMatchingCatch2 {
+package testpackage2 {
 
 public class BoxOverflowException extends BoxDimensionException {
   public function BoxOverflowException(boxErrMsg3: String) {
diff --git a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxUnderzeroException.as b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxUnderzeroException.as
similarity index 86%
rename from tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxUnderzeroException.as
rename to tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxUnderzeroException.as
index eb60c55a6..e1c2ea9e6 100644
--- a/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/UserDefinedErrorsPackageWithoutMatchingCatch2/BoxUnderzeroException.as
+++ b/tests/tests/swfs/from_avmplus/as3/Statements/Exceptions/UserDefinedErrorsPackageWithoutMatchingCatch/testpackage2/BoxUnderzeroException.as
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package UserDefinedErrorsPackageWithoutMatchingCatch2 {
+package testpackage2 {
 
 public class BoxUnderzeroException extends BoxDimensionException {