diff --git a/README.md b/README.md
index 112d25c8..2b54032c 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ We will also include multiple PoC's of various bits of functionality from UI's p
 
 ```
 .
-└── triton-graphql
+└── cloudapi-graphql
 ```
 
-### triton-graphql
+### cloudapi-graphql
 
 An implementation of the [Joyent CloudAPI](https://apidocs.joyent.com/cloudapi/) in GraphQL.
diff --git a/triton-graphql/.eslintrc b/cloudapi-graphql/.eslintrc
similarity index 100%
rename from triton-graphql/.eslintrc
rename to cloudapi-graphql/.eslintrc
diff --git a/triton-graphql/.gitignore b/cloudapi-graphql/.gitignore
similarity index 100%
rename from triton-graphql/.gitignore
rename to cloudapi-graphql/.gitignore
diff --git a/triton-graphql/README.md b/cloudapi-graphql/README.md
similarity index 96%
rename from triton-graphql/README.md
rename to cloudapi-graphql/README.md
index 2c7426f3..f1e7541b 100644
--- a/triton-graphql/README.md
+++ b/cloudapi-graphql/README.md
@@ -1,6 +1,6 @@
-# triton-graphql
+# cloudapi-graphql
 
-Proof-of-Concept of the Triton API running on GraphQL.
+Proof-of-Concept of the [Joyent Cloud API](https://apidocs.joyent.com/cloudapi/) running on GraphQL.
 
 ## Setup
 
diff --git a/triton-graphql/package.json b/cloudapi-graphql/package.json
similarity index 95%
rename from triton-graphql/package.json
rename to cloudapi-graphql/package.json
index 8facfcb1..bfd8c33e 100644
--- a/triton-graphql/package.json
+++ b/cloudapi-graphql/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "triton-graphql",
+  "name": "cloudapi-graphql",
   "private": true,
   "license": "Apache-2.0",
   "version": "1.0.0",
diff --git a/triton-graphql/src/api/account.js b/cloudapi-graphql/src/api/account.js
similarity index 100%
rename from triton-graphql/src/api/account.js
rename to cloudapi-graphql/src/api/account.js
diff --git a/triton-graphql/src/api/config.js b/cloudapi-graphql/src/api/config.js
similarity index 100%
rename from triton-graphql/src/api/config.js
rename to cloudapi-graphql/src/api/config.js
diff --git a/triton-graphql/src/api/datacenters.js b/cloudapi-graphql/src/api/datacenters.js
similarity index 100%
rename from triton-graphql/src/api/datacenters.js
rename to cloudapi-graphql/src/api/datacenters.js
diff --git a/triton-graphql/src/api/fabrics.js b/cloudapi-graphql/src/api/fabrics.js
similarity index 100%
rename from triton-graphql/src/api/fabrics.js
rename to cloudapi-graphql/src/api/fabrics.js
diff --git a/triton-graphql/src/api/firewall-rules.js b/cloudapi-graphql/src/api/firewall-rules.js
similarity index 100%
rename from triton-graphql/src/api/firewall-rules.js
rename to cloudapi-graphql/src/api/firewall-rules.js
diff --git a/triton-graphql/src/api/images.js b/cloudapi-graphql/src/api/images.js
similarity index 100%
rename from triton-graphql/src/api/images.js
rename to cloudapi-graphql/src/api/images.js
diff --git a/triton-graphql/src/api/index.js b/cloudapi-graphql/src/api/index.js
similarity index 100%
rename from triton-graphql/src/api/index.js
rename to cloudapi-graphql/src/api/index.js
diff --git a/triton-graphql/src/api/keys.js b/cloudapi-graphql/src/api/keys.js
similarity index 100%
rename from triton-graphql/src/api/keys.js
rename to cloudapi-graphql/src/api/keys.js
diff --git a/triton-graphql/src/api/machines.js b/cloudapi-graphql/src/api/machines.js
similarity index 100%
rename from triton-graphql/src/api/machines.js
rename to cloudapi-graphql/src/api/machines.js
diff --git a/triton-graphql/src/api/networks.js b/cloudapi-graphql/src/api/networks.js
similarity index 100%
rename from triton-graphql/src/api/networks.js
rename to cloudapi-graphql/src/api/networks.js
diff --git a/triton-graphql/src/api/nics.js b/cloudapi-graphql/src/api/nics.js
similarity index 100%
rename from triton-graphql/src/api/nics.js
rename to cloudapi-graphql/src/api/nics.js
diff --git a/triton-graphql/src/api/packages.js b/cloudapi-graphql/src/api/packages.js
similarity index 100%
rename from triton-graphql/src/api/packages.js
rename to cloudapi-graphql/src/api/packages.js
diff --git a/triton-graphql/src/api/policies.js b/cloudapi-graphql/src/api/policies.js
similarity index 100%
rename from triton-graphql/src/api/policies.js
rename to cloudapi-graphql/src/api/policies.js
diff --git a/triton-graphql/src/api/request.js b/cloudapi-graphql/src/api/request.js
similarity index 92%
rename from triton-graphql/src/api/request.js
rename to cloudapi-graphql/src/api/request.js
index bc76ad5c..ba35db74 100644
--- a/triton-graphql/src/api/request.js
+++ b/cloudapi-graphql/src/api/request.js
@@ -3,9 +3,10 @@ const credentials = require('../../credentials.json');
 const auth = require('smartdc-auth');
 const cloudapi = require('triton/lib/cloudapi2');
 const bunyan = require('bunyan');
+const pkg = require('../../package.json');
 
 var log = bunyan.createLogger({
-  name: 'triton-graphql'
+  name: pkg.name,
 });
 
 var client = cloudapi.createClient({
diff --git a/triton-graphql/src/api/roles.js b/cloudapi-graphql/src/api/roles.js
similarity index 100%
rename from triton-graphql/src/api/roles.js
rename to cloudapi-graphql/src/api/roles.js
diff --git a/triton-graphql/src/api/services.js b/cloudapi-graphql/src/api/services.js
similarity index 100%
rename from triton-graphql/src/api/services.js
rename to cloudapi-graphql/src/api/services.js
diff --git a/triton-graphql/src/api/users.js b/cloudapi-graphql/src/api/users.js
similarity index 100%
rename from triton-graphql/src/api/users.js
rename to cloudapi-graphql/src/api/users.js
diff --git a/triton-graphql/src/index.js b/cloudapi-graphql/src/index.js
similarity index 100%
rename from triton-graphql/src/index.js
rename to cloudapi-graphql/src/index.js
diff --git a/triton-graphql/src/schema/index.js b/cloudapi-graphql/src/schema/index.js
similarity index 100%
rename from triton-graphql/src/schema/index.js
rename to cloudapi-graphql/src/schema/index.js
diff --git a/triton-graphql/src/schema/mutations/account.js b/cloudapi-graphql/src/schema/mutations/account.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/account.js
rename to cloudapi-graphql/src/schema/mutations/account.js
diff --git a/triton-graphql/src/schema/mutations/firewall-rules.js b/cloudapi-graphql/src/schema/mutations/firewall-rules.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/firewall-rules.js
rename to cloudapi-graphql/src/schema/mutations/firewall-rules.js
diff --git a/triton-graphql/src/schema/mutations/images.js b/cloudapi-graphql/src/schema/mutations/images.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/images.js
rename to cloudapi-graphql/src/schema/mutations/images.js
diff --git a/triton-graphql/src/schema/mutations/index.js b/cloudapi-graphql/src/schema/mutations/index.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/index.js
rename to cloudapi-graphql/src/schema/mutations/index.js
diff --git a/triton-graphql/src/schema/mutations/keys.js b/cloudapi-graphql/src/schema/mutations/keys.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/keys.js
rename to cloudapi-graphql/src/schema/mutations/keys.js
diff --git a/triton-graphql/src/schema/mutations/machines.js b/cloudapi-graphql/src/schema/mutations/machines.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/machines.js
rename to cloudapi-graphql/src/schema/mutations/machines.js
diff --git a/triton-graphql/src/schema/mutations/policies.js b/cloudapi-graphql/src/schema/mutations/policies.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/policies.js
rename to cloudapi-graphql/src/schema/mutations/policies.js
diff --git a/triton-graphql/src/schema/mutations/roles.js b/cloudapi-graphql/src/schema/mutations/roles.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/roles.js
rename to cloudapi-graphql/src/schema/mutations/roles.js
diff --git a/triton-graphql/src/schema/mutations/snapshots.js b/cloudapi-graphql/src/schema/mutations/snapshots.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/snapshots.js
rename to cloudapi-graphql/src/schema/mutations/snapshots.js
diff --git a/triton-graphql/src/schema/mutations/users.js b/cloudapi-graphql/src/schema/mutations/users.js
similarity index 100%
rename from triton-graphql/src/schema/mutations/users.js
rename to cloudapi-graphql/src/schema/mutations/users.js
diff --git a/triton-graphql/src/schema/queries/account.js b/cloudapi-graphql/src/schema/queries/account.js
similarity index 100%
rename from triton-graphql/src/schema/queries/account.js
rename to cloudapi-graphql/src/schema/queries/account.js
diff --git a/triton-graphql/src/schema/queries/datacenters.js b/cloudapi-graphql/src/schema/queries/datacenters.js
similarity index 100%
rename from triton-graphql/src/schema/queries/datacenters.js
rename to cloudapi-graphql/src/schema/queries/datacenters.js
diff --git a/triton-graphql/src/schema/queries/fabrics.js b/cloudapi-graphql/src/schema/queries/fabrics.js
similarity index 100%
rename from triton-graphql/src/schema/queries/fabrics.js
rename to cloudapi-graphql/src/schema/queries/fabrics.js
diff --git a/triton-graphql/src/schema/queries/firewall-rules.js b/cloudapi-graphql/src/schema/queries/firewall-rules.js
similarity index 100%
rename from triton-graphql/src/schema/queries/firewall-rules.js
rename to cloudapi-graphql/src/schema/queries/firewall-rules.js
diff --git a/triton-graphql/src/schema/queries/images.js b/cloudapi-graphql/src/schema/queries/images.js
similarity index 100%
rename from triton-graphql/src/schema/queries/images.js
rename to cloudapi-graphql/src/schema/queries/images.js
diff --git a/triton-graphql/src/schema/queries/index.js b/cloudapi-graphql/src/schema/queries/index.js
similarity index 100%
rename from triton-graphql/src/schema/queries/index.js
rename to cloudapi-graphql/src/schema/queries/index.js
diff --git a/triton-graphql/src/schema/queries/machines.js b/cloudapi-graphql/src/schema/queries/machines.js
similarity index 100%
rename from triton-graphql/src/schema/queries/machines.js
rename to cloudapi-graphql/src/schema/queries/machines.js
diff --git a/triton-graphql/src/schema/queries/networks.js b/cloudapi-graphql/src/schema/queries/networks.js
similarity index 100%
rename from triton-graphql/src/schema/queries/networks.js
rename to cloudapi-graphql/src/schema/queries/networks.js
diff --git a/triton-graphql/src/schema/queries/nics.js b/cloudapi-graphql/src/schema/queries/nics.js
similarity index 100%
rename from triton-graphql/src/schema/queries/nics.js
rename to cloudapi-graphql/src/schema/queries/nics.js
diff --git a/triton-graphql/src/schema/queries/packages.js b/cloudapi-graphql/src/schema/queries/packages.js
similarity index 100%
rename from triton-graphql/src/schema/queries/packages.js
rename to cloudapi-graphql/src/schema/queries/packages.js
diff --git a/triton-graphql/src/schema/queries/policies.js b/cloudapi-graphql/src/schema/queries/policies.js
similarity index 100%
rename from triton-graphql/src/schema/queries/policies.js
rename to cloudapi-graphql/src/schema/queries/policies.js
diff --git a/triton-graphql/src/schema/queries/roles.js b/cloudapi-graphql/src/schema/queries/roles.js
similarity index 100%
rename from triton-graphql/src/schema/queries/roles.js
rename to cloudapi-graphql/src/schema/queries/roles.js
diff --git a/triton-graphql/src/schema/queries/services.js b/cloudapi-graphql/src/schema/queries/services.js
similarity index 100%
rename from triton-graphql/src/schema/queries/services.js
rename to cloudapi-graphql/src/schema/queries/services.js
diff --git a/triton-graphql/src/schema/queries/users.js b/cloudapi-graphql/src/schema/queries/users.js
similarity index 100%
rename from triton-graphql/src/schema/queries/users.js
rename to cloudapi-graphql/src/schema/queries/users.js
diff --git a/triton-graphql/src/schema/types/audit.js b/cloudapi-graphql/src/schema/types/audit.js
similarity index 100%
rename from triton-graphql/src/schema/types/audit.js
rename to cloudapi-graphql/src/schema/types/audit.js
diff --git a/triton-graphql/src/schema/types/datacenter.js b/cloudapi-graphql/src/schema/types/datacenter.js
similarity index 100%
rename from triton-graphql/src/schema/types/datacenter.js
rename to cloudapi-graphql/src/schema/types/datacenter.js
diff --git a/triton-graphql/src/schema/types/dynamic-object.js b/cloudapi-graphql/src/schema/types/dynamic-object.js
similarity index 100%
rename from triton-graphql/src/schema/types/dynamic-object.js
rename to cloudapi-graphql/src/schema/types/dynamic-object.js
diff --git a/triton-graphql/src/schema/types/fabric.js b/cloudapi-graphql/src/schema/types/fabric.js
similarity index 100%
rename from triton-graphql/src/schema/types/fabric.js
rename to cloudapi-graphql/src/schema/types/fabric.js
diff --git a/triton-graphql/src/schema/types/firewall-rule.js b/cloudapi-graphql/src/schema/types/firewall-rule.js
similarity index 100%
rename from triton-graphql/src/schema/types/firewall-rule.js
rename to cloudapi-graphql/src/schema/types/firewall-rule.js
diff --git a/triton-graphql/src/schema/types/image.js b/cloudapi-graphql/src/schema/types/image.js
similarity index 100%
rename from triton-graphql/src/schema/types/image.js
rename to cloudapi-graphql/src/schema/types/image.js
diff --git a/triton-graphql/src/schema/types/key.js b/cloudapi-graphql/src/schema/types/key.js
similarity index 100%
rename from triton-graphql/src/schema/types/key.js
rename to cloudapi-graphql/src/schema/types/key.js
diff --git a/triton-graphql/src/schema/types/login.js b/cloudapi-graphql/src/schema/types/login.js
similarity index 100%
rename from triton-graphql/src/schema/types/login.js
rename to cloudapi-graphql/src/schema/types/login.js
diff --git a/triton-graphql/src/schema/types/machine.js b/cloudapi-graphql/src/schema/types/machine.js
similarity index 100%
rename from triton-graphql/src/schema/types/machine.js
rename to cloudapi-graphql/src/schema/types/machine.js
diff --git a/triton-graphql/src/schema/types/network.js b/cloudapi-graphql/src/schema/types/network.js
similarity index 100%
rename from triton-graphql/src/schema/types/network.js
rename to cloudapi-graphql/src/schema/types/network.js
diff --git a/triton-graphql/src/schema/types/nic.js b/cloudapi-graphql/src/schema/types/nic.js
similarity index 100%
rename from triton-graphql/src/schema/types/nic.js
rename to cloudapi-graphql/src/schema/types/nic.js
diff --git a/triton-graphql/src/schema/types/package.js b/cloudapi-graphql/src/schema/types/package.js
similarity index 100%
rename from triton-graphql/src/schema/types/package.js
rename to cloudapi-graphql/src/schema/types/package.js
diff --git a/triton-graphql/src/schema/types/policy.js b/cloudapi-graphql/src/schema/types/policy.js
similarity index 100%
rename from triton-graphql/src/schema/types/policy.js
rename to cloudapi-graphql/src/schema/types/policy.js
diff --git a/triton-graphql/src/schema/types/role.js b/cloudapi-graphql/src/schema/types/role.js
similarity index 100%
rename from triton-graphql/src/schema/types/role.js
rename to cloudapi-graphql/src/schema/types/role.js
diff --git a/triton-graphql/src/schema/types/service.js b/cloudapi-graphql/src/schema/types/service.js
similarity index 100%
rename from triton-graphql/src/schema/types/service.js
rename to cloudapi-graphql/src/schema/types/service.js
diff --git a/triton-graphql/src/schema/types/snapshot.js b/cloudapi-graphql/src/schema/types/snapshot.js
similarity index 100%
rename from triton-graphql/src/schema/types/snapshot.js
rename to cloudapi-graphql/src/schema/types/snapshot.js
diff --git a/triton-graphql/static/.gitkeep b/cloudapi-graphql/static/.gitkeep
similarity index 100%
rename from triton-graphql/static/.gitkeep
rename to cloudapi-graphql/static/.gitkeep