13 files changed, 10 insertions, 10 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index d7d5b4371..1592dc8cb 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -145,8 +145,8 @@ else:
     import random
     import ctypeslib
     import ma
-    import matrx as _mat
-    from matrx import *
+    import matrixlib as _mat
+    from matrixlib import *
 
     # Make these accessible from numpy name-space
     #  but not imported in from numpy import *
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index f6450d305..e46c9b763 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -14,7 +14,7 @@ from numpy.core.numerictypes import find_common_type
 import math
 
 import function_base
-import numpy.matrx as matrix
+import numpy.matrixlib as matrix
 from function_base import diff
 makemat = matrix.matrix
 
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 45cc27ead..437db6d2b 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -20,7 +20,7 @@ from numpy.core import array, asarray, zeros, empty, transpose, \
         isfinite, size
 from numpy.lib import triu
 from numpy.linalg import lapack_lite
-from numpy.matrx.defmatrix import matrix_power
+from numpy.matrixlib.defmatrix import matrix_power
 
 fortran_int = intc
 
diff --git a/numpy/matrx/__init__.py b/numpy/matrixlib/__init__.py
index bdc653b06..bdc653b06 100644
--- a/numpy/matrx/__init__.py
+++ b/numpy/matrixlib/__init__.py
diff --git a/numpy/matrx/defmatrix.py b/numpy/matrixlib/defmatrix.py
index dfa7e4a8d..dfa7e4a8d 100644
--- a/numpy/matrx/defmatrix.py
+++ b/numpy/matrixlib/defmatrix.py
diff --git a/numpy/matrx/setup.py b/numpy/matrixlib/setup.py
index ca288b96e..85b090094 100644
--- a/numpy/matrx/setup.py
+++ b/numpy/matrixlib/setup.py
@@ -3,7 +3,7 @@ import os
 
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('matrx', parent_package, top_path)
+    config = Configuration('matrixlib', parent_package, top_path)
     config.add_data_dir('tests')
     return config
 
diff --git a/numpy/matrx/setupscons.py b/numpy/matrixlib/setupscons.py
index ca288b96e..85b090094 100644
--- a/numpy/matrx/setupscons.py
+++ b/numpy/matrixlib/setupscons.py
@@ -3,7 +3,7 @@ import os
 
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('matrx', parent_package, top_path)
+    config = Configuration('matrixlib', parent_package, top_path)
     config.add_data_dir('tests')
     return config
 
diff --git a/numpy/matrx/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py
index 2cf4914a7..cb6bd801d 100644
--- a/numpy/matrx/tests/test_defmatrix.py
+++ b/numpy/matrixlib/tests/test_defmatrix.py
@@ -1,8 +1,8 @@
 from numpy.testing import *
 from numpy.core import *
 from numpy import matrix, asmatrix, bmat
-from numpy.matrx.defmatrix import matrix_power
-from numpy.matrx import mat
+from numpy.matrixlib.defmatrix import matrix_power
+from numpy.matrixlib import mat
 import numpy as np
 
 class TestCtor(TestCase):
diff --git a/numpy/matrx/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py
index 9f2dce7e4..9f2dce7e4 100644
--- a/numpy/matrx/tests/test_multiarray.py
+++ b/numpy/matrixlib/tests/test_multiarray.py
diff --git a/numpy/matrx/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py
index 0b96bb05a..0b96bb05a 100644
--- a/numpy/matrx/tests/test_numeric.py
+++ b/numpy/matrixlib/tests/test_numeric.py
diff --git a/numpy/matrx/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py
index e0dd745ef..e0dd745ef 100644
--- a/numpy/matrx/tests/test_regression.py
+++ b/numpy/matrixlib/tests/test_regression.py
diff --git a/numpy/setup.py b/numpy/setup.py
index 3aba00ca2..52580ca41 100644
--- a/numpy/setup.py
+++ b/numpy/setup.py
@@ -14,7 +14,7 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('linalg')
     config.add_subpackage('random')
     config.add_subpackage('ma')
-    config.add_subpackage('matrx')
+    config.add_subpackage('matrixlib')
     config.add_subpackage('doc')
     config.add_data_dir('doc')
     config.add_data_dir('tests')
diff --git a/numpy/setupscons.py b/numpy/setupscons.py
index f242edc7b..45b02ee84 100644
--- a/numpy/setupscons.py
+++ b/numpy/setupscons.py
@@ -19,7 +19,7 @@ def configuration(parent_package='', top_path=None):
     config.add_subpackage('linalg')
     config.add_subpackage('random')
     config.add_subpackage('ma')
-    config.add_subpackage('matrx')
+    config.add_subpackage('matrixlib')
     config.add_data_dir('doc')
     config.add_data_dir('tests')