diff --git a/LICENSE b/LICENSE
index dcadb4b0..506fdcf2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Gerald Yeo
+Copyright (c) 2014 Gerald Yeo <contact@fusedthought.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 0b528703..f6fbec17 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ You'll need to add the following scripts to your code:
 
 ```html
 <!-- required: common lib -->
-<script src="otplib_common.js"></script>
+<script src="otplib-commons.js"></script>
 
 <!-- replace with any of the available files below -->
 <script src="otplib.js"></script>
@@ -147,11 +147,11 @@ You'll need to add the following scripts to your code:
 __Available files:__
 
 -   `otplib.js`           - (hotp / totp / google authenticator)
--   `otplib_hotp.js`      - (hotp)
--   `otplib_totp.js`      - (totp)
--   `otplib_ga.js`        - (google authenticator)
--   `otplib_otputils.js`  - (utilites)
--   `otplib_legacy.js`    - (v2 interface)
+-   `otplib-hotp.js`      - (hotp)
+-   `otplib-totp.js`      - (totp)
+-   `otplib-ga.js`        - (google authenticator)
+-   `otplib-otputils.js`  - (utilites)
+-   `otplib-legacy.js`    - (v2 interface)
 
 You can find these files in `node_modules/otplib/dist` after you install.
 Alternatively, you can get the latest [here](https://github.com/yeojz/otplib/tree/gh-pages/lib).
diff --git a/site/package.json b/site/package.json
index bd927d50..6fb45e1c 100644
--- a/site/package.json
+++ b/site/package.json
@@ -14,7 +14,7 @@
   "keywords": [
     "otplib"
   ],
-  "author": "Gerald Yeo",
+  "author": "Gerald Yeo <contact@fusedthought.com>",
   "license": "MIT",
   "dependencies": {
     "copy": "^0.3.0",
diff --git a/site/public/index.html b/site/public/index.html
index 90ff7972..6a180127 100644
--- a/site/public/index.html
+++ b/site/public/index.html
@@ -106,7 +106,7 @@ <h3>QR Code</h3>
     </div>
 
     <script src="%PUBLIC_URL%/js/qrcode.min.js"></script>
-    <script src="%PUBLIC_URL%/lib/otplib_commons.js"></script>
+    <script src="%PUBLIC_URL%/lib/otplib-commons.js"></script>
     <script src="%PUBLIC_URL%/lib/otplib.js"></script>
     <script src="%PUBLIC_URL%/js/app.js"></script>
   </body>
diff --git a/webpack.config.js b/webpack.config.js
index 18bebce2..c382e53e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,11 +16,11 @@ if (process.env.OTPLIB_WEBPACK_USE_NODE_CRYPTO !== 'true') {
 module.exports = {
   entry: {
     'otplib': SOURCE_FOLDER + '/index.js',
-    'otplib_ga': SOURCE_FOLDER + '/authenticator.js',
-    'otplib_hotp': SOURCE_FOLDER + '/hotp.js',
-    'otplib_legacy': SOURCE_FOLDER + '/v2.js',
-    'otplib_totp': SOURCE_FOLDER + '/totp.js',
-    'otplib_utils': SOURCE_FOLDER + '/classes/OTPUtils.js'
+    'otplib-ga': SOURCE_FOLDER + '/authenticator.js',
+    'otplib-hotp': SOURCE_FOLDER + '/hotp.js',
+    'otplib-legacy': SOURCE_FOLDER + '/v2.js',
+    'otplib-totp': SOURCE_FOLDER + '/totp.js',
+    'otplib-utils': SOURCE_FOLDER + '/classes/OTPUtils.js'
   },
   output: {
     library: '[name]',
@@ -46,7 +46,7 @@ module.exports = {
       'process.env.OTPLIB_WEBPACK': JSON.stringify(OTPLIB_WEBPACK)
     }),
     new webpack.optimize.CommonsChunkPlugin({
-      name: 'otplib_commons'
+      name: 'otplib-commons'
     }),
     new webpack.optimize.UglifyJsPlugin({
       compress: {