diff --git a/config/webpack.config.demo.js b/config/webpack.config.demo.js
index 15565f16..c5e8ebee 100644
--- a/config/webpack.config.demo.js
+++ b/config/webpack.config.demo.js
@@ -60,7 +60,8 @@ module.exports = {
     // CRL: Updated whole block with library specific info
     path: paths.appDemoBuild,
     filename: 'index.js',
-    libraryTarget: 'umd'
+    libraryTarget: 'umd',
+    library: 'SimpleKeyboard'
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index a42c973f..36843a29 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -57,7 +57,8 @@ module.exports = {
     // CRL: Updated whole block with library specific info
     path: paths.appBuild,
     filename: 'index.js',
-    libraryTarget: 'umd'
+    libraryTarget: 'umd',
+    library: 'SimpleKeyboard'
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
diff --git a/package.json b/package.json
index 7612fbf2..0d0dba47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-keyboard",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "On-screen Virtual Keyboard",
   "main": "build/index.js",
   "scripts": {
diff --git a/src/lib/components/Keyboard.js b/src/lib/components/Keyboard.js
index c668e91a..c481eff0 100644
--- a/src/lib/components/Keyboard.js
+++ b/src/lib/components/Keyboard.js
@@ -172,4 +172,3 @@ class SimpleKeyboard {
 }
 
 export default SimpleKeyboard;
-export {SimpleKeyboard};