diff --git a/docs/api/steam.client.features.rst b/docs/api/steam.client.builtins.rst
similarity index 54%
rename from docs/api/steam.client.features.rst
rename to docs/api/steam.client.builtins.rst
index 43305f9..a6b6a75 100644
--- a/docs/api/steam.client.features.rst
+++ b/docs/api/steam.client.builtins.rst
@@ -1,12 +1,12 @@
-steam.client.features
+steam.client.builtins
 =====================
 
-.. automodule:: steam.client.features
+.. automodule:: steam.client.builtins
 
 User
 ----
 
-.. automodule:: steam.client.features.user
+.. automodule:: steam.client.builtins.user
     :members:
     :undoc-members:
     :show-inheritance:
@@ -14,7 +14,7 @@ User
 Web
 ---
 
-.. automodule:: steam.client.features.web
+.. automodule:: steam.client.builtins.web
     :members:
     :undoc-members:
     :show-inheritance:
@@ -22,7 +22,7 @@ Web
 Misc
 ----
 
-.. automodule:: steam.client.features.misc
+.. automodule:: steam.client.builtins.misc
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/api/steam.client.rst b/docs/api/steam.client.rst
index bfc3de3..c809292 100644
--- a/docs/api/steam.client.rst
+++ b/docs/api/steam.client.rst
@@ -2,7 +2,7 @@ steam.client
 ============
 
 .. toctree::
-    steam.client.features
+    steam.client.builtins
     steam.client.mixins
     steam.client.gc
 
diff --git a/steam/client/__init__.py b/steam/client/__init__.py
index 100d077..8d5d701 100644
--- a/steam/client/__init__.py
+++ b/steam/client/__init__.py
@@ -12,10 +12,10 @@ from steam.enums import EResult, EOSType, EPersonaState
 from steam.core.msg import MsgProto
 from steam.core.cm import CMClient
 from steam import SteamID
-from steam.client.features import FeatureBase
+from steam.client.builtins import BuiltinBase
 
 
-class SteamClient(CMClient, FeatureBase):
+class SteamClient(CMClient, BuiltinBase):
     """
     Implementation of Steam client based on ``gevent``
 
@@ -39,7 +39,7 @@ class SteamClient(CMClient, FeatureBase):
         #: indicates logged on status. Listen to ``logged_on`` when change to ``True``
         self.logged_on = False
 
-        FeatureBase.__init__(self)
+        BuiltinBase.__init__(self)
 
     def __repr__(self):
         return "<%s(%s) %s>" % (self.__class__.__name__,
diff --git a/steam/client/features/__init__.py b/steam/client/builtins/__init__.py
similarity index 51%
rename from steam/client/features/__init__.py
rename to steam/client/builtins/__init__.py
index 855e8d8..dac72cb 100644
--- a/steam/client/features/__init__.py
+++ b/steam/client/builtins/__init__.py
@@ -1,11 +1,11 @@
 """
-All high level features of :class:`steam.client.SteamClient` are here in seperate submodules.
+All high level features of :class:`steam.client.SteamClient` are implemented here in seperate submodules.
 """
-from steam.client.features.misc import Misc
-from steam.client.features.user import User
-from steam.client.features.web import Web
+from steam.client.builtins.misc import Misc
+from steam.client.builtins.user import User
+from steam.client.builtins.web import Web
 
-class FeatureBase(Misc, User, Web):
+class BuiltinBase(Misc, User, Web):
     """
     This object is used as base to implement all high level functionality.
     The features are seperated into submodules.
diff --git a/steam/client/features/misc.py b/steam/client/builtins/misc.py
similarity index 100%
rename from steam/client/features/misc.py
rename to steam/client/builtins/misc.py
diff --git a/steam/client/features/user.py b/steam/client/builtins/user.py
similarity index 100%
rename from steam/client/features/user.py
rename to steam/client/builtins/user.py
diff --git a/steam/client/features/web.py b/steam/client/builtins/web.py
similarity index 100%
rename from steam/client/features/web.py
rename to steam/client/builtins/web.py