diff --git a/marconi/__init__.py b/marconi/__init__.py
index 932b67f19..ff5efd56a 100644
--- a/marconi/__init__.py
+++ b/marconi/__init__.py
@@ -19,7 +19,7 @@ try:
 except NameError:
     import gettext
     gettext.install("marconi", unicode=1)
-    from marconi.kernel import Kernel  # NOQA
+    from marconi.bootstrap import Bootstrap  # NOQA
 else:
     import sys as _sys
     _sys.stderr.write('Running from marconi source directory.\n')
diff --git a/marconi/kernel.py b/marconi/bootstrap.py
similarity index 90%
rename from marconi/kernel.py
rename to marconi/bootstrap.py
index 8083cdec9..06d46cb35 100644
--- a/marconi/kernel.py
+++ b/marconi/bootstrap.py
@@ -21,11 +21,11 @@ from marconi.transport.wsgi import driver as wsgi
 cfg_handle = config.project('marconi')
 
 
-class Kernel(object):
+class Bootstrap(object):
     """
-    Defines the Marconi Kernel
+    Defines the Marconi Bootstrap
 
-    The Kernel loads up drivers per a given configuration, and manages their
+    The bootstrap loads up drivers per a given configuration, and manages their
     lifetimes.
     """
 
diff --git a/marconi/tests/test_simple.py b/marconi/tests/test_simple.py
index 2a390c04d..176a144d8 100644
--- a/marconi/tests/test_simple.py
+++ b/marconi/tests/test_simple.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from marconi import kernel
+import marconi
 from marconi.tests.util import suite
 
 
@@ -21,7 +21,7 @@ class TestSimple(suite.TestSuite):
     def test_simple(self):
         """Doesn't really test much."""
         conf_file = self.conf_path('wsgi_reference.conf')
-        k = kernel.Kernel(conf_file)
-        transport = k.transport
+        boot = marconi.Bootstrap(conf_file)
+        transport = boot.transport
         wsgi_app = transport.app
         self.assertTrue(True)