diff --git a/doc/ev3dev/ev3brick.rst b/doc/ev3dev/hubs_ev3brick.rst
similarity index 98%
rename from doc/ev3dev/ev3brick.rst
rename to doc/ev3dev/hubs_ev3brick.rst
index bb9176f..542942a 100644
--- a/doc/ev3dev/ev3brick.rst
+++ b/doc/ev3dev/hubs_ev3brick.rst
@@ -1,5 +1,5 @@
-:mod:`hubs` -- LEGO® Programmable Hubs
-=============================================
+:mod:`hubs` -- EV3 Brick
+==============================================
 
 .. automodule:: pybricks.hubs
     :no-members:
diff --git a/doc/ev3dev/index.rst b/doc/ev3dev/index.rst
index 55de810..52abffc 100644
--- a/doc/ev3dev/index.rst
+++ b/doc/ev3dev/index.rst
@@ -36,7 +36,7 @@ programs and start inventing your own programs.
    :caption: Pybricks Hubs
    :hidden:
 
-   ev3brick
+   hubs_ev3brick
 
 .. toctree::
    :maxdepth: 1
diff --git a/pybricks/ev3brick.py b/pybricks/ev3brick.py
deleted file mode 100644
index f655cd1..0000000
--- a/pybricks/ev3brick.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""LEGO® MINDSTORMS® EV3 Brick."""
-
-from .builtins import Speaker, Display, Battery, ColorLight, KeyPad
-
-sound = Speaker()
-display = Display()
-battery = Battery()
-light = ColorLight()
-buttons = KeyPad()
diff --git a/pybricks/hubs.py b/pybricks/hubs.py
index 9ecffe0..27bccde 100644
--- a/pybricks/hubs.py
+++ b/pybricks/hubs.py
@@ -4,8 +4,7 @@ from .builtins import Speaker, Display, Battery, ColorLight, KeyPad
 
 
 class EV3Brick():
-    """LEGO® MINDSTORMS® EV3 Brick.
-    """
+    """LEGO® MINDSTORMS® EV3 Brick."""
     Port = Enum('Port', ['A', 'B', 'C', 'D', 'S1', 'S2', 'S3', 'S4'])
     speaker = Speaker()
     display = Display()