diff --git a/dist/adaptor.js b/dist/adaptor.js
index 59b59a4..716ade7 100644
--- a/dist/adaptor.js
+++ b/dist/adaptor.js
@@ -17,7 +17,7 @@
 
   require('./basestar');
 
-  namespace('Cylon.Adaptors', function() {
+  namespace('Cylon', function() {
     return this.Adaptor = (function(_super) {
       __extends(Adaptor, _super);
 
diff --git a/dist/driver.js b/dist/driver.js
index ab292d1..fc2d90f 100644
--- a/dist/driver.js
+++ b/dist/driver.js
@@ -17,7 +17,7 @@
 
   require('./basestar');
 
-  namespace('Cylon.Drivers', function() {
+  namespace('Cylon', function() {
     return this.Driver = (function(_super) {
       __extends(Driver, _super);
 
diff --git a/dist/test/loopback.js b/dist/test/loopback.js
index 5da27e2..492d3ea 100644
--- a/dist/test/loopback.js
+++ b/dist/test/loopback.js
@@ -44,7 +44,7 @@
 
       return Loopback;
 
-    })(Cylon.Adaptors.Adaptor);
+    })(Cylon.Adaptor);
   });
 
 }).call(this);
diff --git a/dist/test/ping.js b/dist/test/ping.js
index 61e5d9e..d9621d2 100644
--- a/dist/test/ping.js
+++ b/dist/test/ping.js
@@ -48,7 +48,7 @@
 
       return Ping;
 
-    })(Cylon.Drivers.Driver);
+    })(Cylon.Driver);
   });
 
 }).call(this);
diff --git a/src/adaptor.coffee b/src/adaptor.coffee
index 6286dab..8018502 100644
--- a/src/adaptor.coffee
+++ b/src/adaptor.coffee
@@ -12,7 +12,7 @@ namespace = require 'node-namespace'
 
 require './basestar'
 
-namespace 'Cylon.Adaptors', ->
+namespace 'Cylon', ->
   class @Adaptor extends Cylon.Basestar
     constructor: (opts={}) ->
       @self = this
diff --git a/src/driver.coffee b/src/driver.coffee
index d0481b7..5722419 100644
--- a/src/driver.coffee
+++ b/src/driver.coffee
@@ -12,7 +12,7 @@ namespace = require 'node-namespace'
 
 require './basestar'
 
-namespace 'Cylon.Drivers', ->
+namespace 'Cylon', ->
   class @Driver extends Cylon.Basestar
     constructor: (opts={}) ->
       @self = this
diff --git a/src/test/loopback.coffee b/src/test/loopback.coffee
index b8bc7fa..5206ede 100644
--- a/src/test/loopback.coffee
+++ b/src/test/loopback.coffee
@@ -15,6 +15,6 @@ module.exports =
     new Cylon.Adaptors.Loopback(args...)
 
 namespace 'Cylon.Adaptors', ->
-  class @Loopback extends Cylon.Adaptors.Adaptor
+  class @Loopback extends Cylon.Adaptor
     commands: ->
       ['ping']
diff --git a/src/test/ping.coffee b/src/test/ping.coffee
index 66d70f3..b4088ae 100644
--- a/src/test/ping.coffee
+++ b/src/test/ping.coffee
@@ -15,7 +15,7 @@ module.exports =
     new Cylon.Drivers.Ping(args...)
 
 namespace 'Cylon.Drivers', ->
-  class @Ping extends Cylon.Drivers.Driver
+  class @Ping extends Cylon.Driver
     commands: ->
       ['ping']
 
diff --git a/test/dist/specs/adaptor.spec.js b/test/dist/specs/adaptor.spec.js
index cc407c7..38853cf 100644
--- a/test/dist/specs/adaptor.spec.js
+++ b/test/dist/specs/adaptor.spec.js
@@ -4,7 +4,7 @@
 
   describe("Adaptor", function() {
     var adaptor;
-    adaptor = new Cylon.Adaptors.Adaptor({
+    adaptor = new Cylon.Adaptor({
       name: 'adapt'
     });
     return it('needs tests');
diff --git a/test/dist/specs/driver.spec.js b/test/dist/specs/driver.spec.js
index 155ec35..d09b368 100644
--- a/test/dist/specs/driver.spec.js
+++ b/test/dist/specs/driver.spec.js
@@ -4,7 +4,7 @@
 
   describe("Driver", function() {
     var driver;
-    driver = new Cylon.Drivers.Driver({
+    driver = new Cylon.Driver({
       name: 'max',
       device: {
         connection: 'connect',
diff --git a/test/src/specs/adaptor.spec.coffee b/test/src/specs/adaptor.spec.coffee
index 30b54c6..1760ade 100644
--- a/test/src/specs/adaptor.spec.coffee
+++ b/test/src/specs/adaptor.spec.coffee
@@ -3,6 +3,6 @@
 source "adaptor"
 
 describe "Adaptor", ->
-  adaptor = new Cylon.Adaptors.Adaptor(name: 'adapt')
+  adaptor = new Cylon.Adaptor(name: 'adapt')
 
   it 'needs tests'
diff --git a/test/src/specs/driver.spec.coffee b/test/src/specs/driver.spec.coffee
index 4cec355..1850cd7 100644
--- a/test/src/specs/driver.spec.coffee
+++ b/test/src/specs/driver.spec.coffee
@@ -3,6 +3,6 @@
 source "driver"
 
 describe "Driver", ->
-  driver = new Cylon.Drivers.Driver(name: 'max', device: {connection: 'connect', pin: 13})
+  driver = new Cylon.Driver(name: 'max', device: {connection: 'connect', pin: 13})
 
   it 'needs tests'