diff --git a/lib/cloudevent.js b/lib/cloudevent.js
index 8c6bcdc..ceec705 100644
--- a/lib/cloudevent.js
+++ b/lib/cloudevent.js
@@ -1,7 +1,7 @@
-var Spec_0_1           = require("./specs/spec_0_1.js");
-var Spec_0_2           = require("./specs/spec_0_2.js");
-var JSONFormatter_0_1  = require("./formats/json_0_1.js");
-var HTTPStructured_0_1 = require("./bindings/http/structured_0_1.js");
+var Spec01           = require("./specs/spec_0_1.js");
+var Spec02           = require("./specs/spec_0_2.js");
+var JSONFormatter01  = require("./formats/json_0_1.js");
+var HTTPStructured01 = require("./bindings/http/structured_0_1.js");
 
 /*
  * Class created using the Builder Design Pattern.
@@ -9,8 +9,8 @@ var HTTPStructured_0_1 = require("./bindings/http/structured_0_1.js");
  * https://en.wikipedia.org/wiki/Builder_pattern
  */
 function Cloudevent(_spec, _formatter){
-  this.spec      = (_spec) ? new _spec(Cloudevent) : new Spec_0_1(Cloudevent);
-  this.formatter = (_formatter) ? _formatter : new JSONFormatter_0_1();
+  this.spec      = (_spec) ? new _spec(Cloudevent) : new Spec01(Cloudevent);
+  this.formatter = (_formatter) ? _formatter : new JSONFormatter01();
 }
 
 /*
@@ -72,21 +72,21 @@ Cloudevent.prototype.addExtension = function(key, value){
  * Export the specs
  */
 Cloudevent.specs = {
-  "0.1": Spec_0_1,
-  "0.2": Spec_0_2
+  "0.1": Spec01,
+  "0.2": Spec02
 };
 
 /*
  * Export the formats
  */
 Cloudevent.formats = {
-  "json"   : JSONFormatter_0_1,
-  "json0.1": JSONFormatter_0_1
+  "json"   : JSONFormatter01,
+  "json0.1": JSONFormatter01
 };
 
 Cloudevent.bindings = {
-  "http-structured"    : HTTPStructured_0_1,
-  "http-structured0.1" : HTTPStructured_0_1
+  "http-structured"    : HTTPStructured01,
+  "http-structured0.1" : HTTPStructured01
 };
 
 module.exports = Cloudevent;