diff --git a/scikits/learn/__init__.py b/scikits/learn/__init__.py
index a554e4409bcbc67afe440a86295920d1db29b127..d133caa501ee8bfa13b4453dbc3e43c1f065abed 100644
--- a/scikits/learn/__init__.py
+++ b/scikits/learn/__init__.py
@@ -24,7 +24,7 @@ from . import logistic
 from . import lda
 from . import metrics
 from . import svm
-from . import features
+from . import feature_selection
 
 try:
     from numpy.testing import nosetester
diff --git a/scikits/learn/datasets/mlcomp.py b/scikits/learn/datasets/mlcomp.py
index 038d29415c463b92cb912b313440fa58b77be235..232543b6943468b34cea83ce21b0e08fd6122452 100644
--- a/scikits/learn/datasets/mlcomp.py
+++ b/scikits/learn/datasets/mlcomp.py
@@ -5,8 +5,8 @@
 import os
 import numpy as np
 from scikits.learn.datasets.base import Bunch
-from scikits.learn.features.text import HashingVectorizer
-from scikits.learn.features.text import SparseHashingVectorizer
+from scikits.learn.feature_extraction.text import HashingVectorizer
+from scikits.learn.feature_extraction.text import SparseHashingVectorizer
 
 
 def _load_document_classification(dataset_path, metadata, set_, sparse, **kw):
diff --git a/scikits/learn/features/__init__.py b/scikits/learn/feature_extraction/__init__.py
similarity index 100%
rename from scikits/learn/features/__init__.py
rename to scikits/learn/feature_extraction/__init__.py
diff --git a/scikits/learn/features/image.py b/scikits/learn/feature_extraction/image.py
similarity index 100%
rename from scikits/learn/features/image.py
rename to scikits/learn/feature_extraction/image.py
diff --git a/scikits/learn/features/tests/__init__.py b/scikits/learn/feature_extraction/tests/__init__.py
similarity index 100%
rename from scikits/learn/features/tests/__init__.py
rename to scikits/learn/feature_extraction/tests/__init__.py
diff --git a/scikits/learn/features/tests/test_image.py b/scikits/learn/feature_extraction/tests/test_image.py
similarity index 100%
rename from scikits/learn/features/tests/test_image.py
rename to scikits/learn/feature_extraction/tests/test_image.py
diff --git a/scikits/learn/features/tests/test_text.py b/scikits/learn/feature_extraction/tests/test_text.py
similarity index 92%
rename from scikits/learn/features/tests/test_text.py
rename to scikits/learn/feature_extraction/tests/test_text.py
index f70dcf7326a6d0edb8514dc1710a9bfc44be319f..76444d566e625496b9d1d526d7872fcbe4ee30cc 100644
--- a/scikits/learn/features/tests/test_text.py
+++ b/scikits/learn/feature_extraction/tests/test_text.py
@@ -1,11 +1,11 @@
-from scikits.learn.features.text import strip_accents
-from scikits.learn.features.text import WordNGramAnalyzer
-from scikits.learn.features.text import CharNGramAnalyzer
-from scikits.learn.features.text import TermCountVectorizer
-from scikits.learn.features.text import TfidfTransformer
-from scikits.learn.features.text import TfidfVectorizer
-from scikits.learn.features.text import HashingVectorizer
-from scikits.learn.features.text import SparseHashingVectorizer
+from scikits.learn.feature_extraction.text import strip_accents
+from scikits.learn.feature_extraction.text import WordNGramAnalyzer
+from scikits.learn.feature_extraction.text import CharNGramAnalyzer
+from scikits.learn.feature_extraction.text import TermCountVectorizer
+from scikits.learn.feature_extraction.text import TfidfTransformer
+from scikits.learn.feature_extraction.text import TfidfVectorizer
+from scikits.learn.feature_extraction.text import HashingVectorizer
+from scikits.learn.feature_extraction.text import SparseHashingVectorizer
 from scikits.learn.svm import LinearSVC as DenseLinearSVC
 from scikits.learn.svm.sparse import LinearSVC as SparseLinearSVC
 import numpy as np
diff --git a/scikits/learn/features/text.py b/scikits/learn/feature_extraction/text.py
similarity index 100%
rename from scikits/learn/features/text.py
rename to scikits/learn/feature_extraction/text.py
diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index 01f5a5c8327adc4a8d1e06ca69d886660a357b3a..01e4b91d07cf5250fc3307232d5d8ca561c2a473 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -11,8 +11,8 @@ def configuration(parent_package='', top_path=None):
 
     config.add_subpackage('svm')
     config.add_subpackage('datasets')
-    config.add_subpackage('features')
-    config.add_subpackage('features/tests')
+    config.add_subpackage('feature_extraction')
+    config.add_subpackage('feature_extraction/tests')
     config.add_subpackage('cluster')
     config.add_subpackage('cluster/tests')
     config.add_subpackage('covariance')