diff --git a/src/account.ts b/src/account.ts
index 661b0508..4732d98d 100644
--- a/src/account.ts
+++ b/src/account.ts
@@ -2,7 +2,7 @@ const assert = require('assert')
 const ethjsUtil = require('ethjs-util')
 const secp256k1 = require('secp256k1')
 import BN = require('bn.js')
-import { toBuffer, addHexPrefix, zeros, bufferToHex, unpad } from './buffer'
+import { toBuffer, addHexPrefix, zeros, bufferToHex, unpad } from './bytes'
 import { keccak, keccak256, rlphash } from './hash'
 
 /**
diff --git a/src/buffer.ts b/src/bytes.ts
similarity index 100%
rename from src/buffer.ts
rename to src/bytes.ts
diff --git a/src/hash.ts b/src/hash.ts
index 27cb9d2a..bc34d2f3 100644
--- a/src/hash.ts
+++ b/src/hash.ts
@@ -1,7 +1,7 @@
 const createKeccakHash = require('keccak')
 const createHash = require('create-hash')
 import rlp = require('rlp')
-import { toBuffer, setLength } from './buffer'
+import { toBuffer, setLength } from './bytes'
 
 /**
  * Creates Keccak hash of the input
diff --git a/src/index.ts b/src/index.ts
index 4eaf2f28..c44af02e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -40,9 +40,9 @@ export * from './hash'
 export * from './signature'
 
 /**
- * Utilities for manipulating Buffers
+ * Utilities for manipulating Buffers, byte arrays, etc.
  */
-export * from './buffer'
+export * from './bytes'
 
 /**
  * Function for definining properties on an object
diff --git a/src/object.ts b/src/object.ts
index 7ffd6e0f..24ca0cfb 100644
--- a/src/object.ts
+++ b/src/object.ts
@@ -1,7 +1,7 @@
 const assert = require('assert')
 const ethjsUtil = require('ethjs-util')
 import rlp = require('rlp')
-import { toBuffer, baToJSON, stripZeros } from './buffer'
+import { toBuffer, baToJSON, stripZeros } from './bytes'
 
 /**
  * Defines properties on a `Object`. It make the assumption that underlying data is binary.
diff --git a/src/signature.ts b/src/signature.ts
index 26553891..820ec6e7 100644
--- a/src/signature.ts
+++ b/src/signature.ts
@@ -1,6 +1,6 @@
 const secp256k1 = require('secp256k1')
 import BN = require('bn.js')
-import { toBuffer, setLength, setLengthLeft, bufferToHex } from './buffer'
+import { toBuffer, setLength, setLengthLeft, bufferToHex } from './bytes'
 import { keccak } from './hash'
 
 export interface ECDSASignature {