diff --git a/README.md b/README.md
index feec716..0ecf627 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,6 @@ With the help of browserify `bitmessage` provides different implementations for
   - [ ] net_addr
   - [ ] inv_vect
   - [ ] encrypted
-  - [ ] unencrypted
   - [ ] encoding
   - [ ] bitfield
 - [ ] Message types
diff --git a/lib/address.js b/lib/address.js
index 9cf5f50..096a05a 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -11,7 +11,7 @@ require("object.assign").shim();
 var assert = require("assert");
 var bufferEqual = require("buffer-equal");
 var bs58 = require("bs58");
-var var_int = require("./struct").var_int;
+var var_int = require("./structs").var_int;
 var bmcrypto = require("./crypto");
 
 /**
diff --git a/lib/index.js b/lib/index.js
index f6de2fb..c9cfa6d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -6,11 +6,11 @@
 "use strict";
 
 /** Common structures. */
-exports.struct = require("./struct");
+exports.structs = require("./structs");
 /** Messages. */
-exports.message = require("./message");
+exports.messages = require("./messages");
 /** Objects. */
-exports.object = require("./object");
+exports.objects = require("./objects");
 
 /** Working with WIF. */
 exports.WIF = require("./wif");
diff --git a/lib/message.js b/lib/messages.js
similarity index 100%
rename from lib/message.js
rename to lib/messages.js
diff --git a/lib/object.js b/lib/objects.js
similarity index 100%
rename from lib/object.js
rename to lib/objects.js
diff --git a/lib/struct.js b/lib/structs.js
similarity index 100%
rename from lib/struct.js
rename to lib/structs.js
diff --git a/test.js b/test.js
index a3092ea..fbc649c 100644
--- a/test.js
+++ b/test.js
@@ -5,9 +5,9 @@ var allTests = typeof window === "undefined" ?
 
 var bmcrypto = require("./lib/crypto");
 var bitmessage = require("./lib");
-var var_int = bitmessage.struct.var_int;
-var var_str = bitmessage.struct.var_str;
-var var_int_list = bitmessage.struct.var_int_list;
+var var_int = bitmessage.structs.var_int;
+var var_str = bitmessage.structs.var_str;
+var var_int_list = bitmessage.structs.var_int_list;
 var WIF = bitmessage.WIF;
 var Address = bitmessage.Address;