diff --git a/src/OrbitClient.js b/src/Client.js
similarity index 98%
rename from src/OrbitClient.js
rename to src/Client.js
index eee90be..fc9d498 100644
--- a/src/OrbitClient.js
+++ b/src/Client.js
@@ -7,7 +7,7 @@ const ipfsDaemon   = require('orbit-common/lib/ipfs-daemon');
 const PubSub       = require('./PubSub');
 const OrbitDB      = require('./OrbitDB');
 
-class OrbitClient {
+class Client {
   constructor(ipfs, daemon) {
     this._ipfs = ipfs;
     this._pubsub = null;
@@ -102,7 +102,7 @@ class OrbitClientFactory {
       ipfs = ipfsd.ipfs;
     }
 
-    const client = new OrbitClient(ipfs);
+    const client = new Client(ipfs);
     await(client._connect(host, port, username, password, allowOffline))
     return client;
   }
diff --git a/test/orbit-client-tests.js b/test/orbit-client-tests.js
index 12f8c6b..bf081d9 100644
--- a/test/orbit-client-tests.js
+++ b/test/orbit-client-tests.js
@@ -4,7 +4,7 @@ const _           = require('lodash');
 const assert      = require('assert');
 const async       = require('asyncawait/async');
 const await       = require('asyncawait/await');
-const OrbitClient = require('../src/OrbitClient');
+const OrbitClient = require('../src/Client');
 
 // Orbit
 const host     = 'localhost';