diff --git a/Gruntfile.js b/Gruntfile.js
index ba7cf8c6ab..951340c1a2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -50,15 +50,11 @@ module.exports = grunt => {
         ...buildUtils.getPreparedBundleLibList(libs),
     ];
 
-    let bundleFileMap = {'client/lib/espo-libs.min.js': libsBundleFileList};
+    let bundleFileMap = {'client/lib/espo.min.js': libsBundleFileList};
 
     for (let name in bundleConfig.chunks) {
         let namePart = 'espo-' + name;
 
-        if (name === 'main') {
-            namePart = 'espo';
-        }
-
         bundleFileMap[`client/lib/${namePart}.min.js`] = originalLibDir + `/${namePart}.js`
     }
 
@@ -291,8 +287,6 @@ module.exports = grunt => {
 
             if (name === 'main') {
                 contents += '\n' + (new LayoutTypeBundler()).bundle();
-
-                key = 'espo';
             }
 
             writeOriginalLib(key, contents);
diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json
index bcef63ca3f..f2e759472f 100644
--- a/application/Espo/Resources/metadata/app/client.json
+++ b/application/Espo/Resources/metadata/app/client.json
@@ -1,7 +1,7 @@
 {
     "scriptList": [
-        "client/lib/espo-libs.min.js",
-        "client/lib/espo.min.js"
+        "client/lib/espo.min.js",
+        "client/lib/espo-main.min.js"
     ],
     "developerModeScriptList": [
         "client/src/loader.js"
diff --git a/js/bundler/bundler-general.js b/js/bundler/bundler-general.js
index 79975c9046..b15783487f 100644
--- a/js/bundler/bundler-general.js
+++ b/js/bundler/bundler-general.js
@@ -96,7 +96,6 @@ class BundlerGeneral {
                 return;
             }
 
-
             data.modules.forEach(item => mapping[item] = name);
 
             let bundleFile = this.filePattern.replace('{*}', name);
diff --git a/js/diff.js b/js/diff.js
index 64a90e1bd3..b4b6dcf9cd 100644
--- a/js/diff.js
+++ b/js/diff.js
@@ -281,12 +281,12 @@ class Diff
 
             libData.filesToCopy.forEach(item => fileList.push(item));
 
-            fileList.push('client/lib/espo-libs.min.js');
-            fileList.push('client/lib/espo-libs.min.js.map');
+            fileList.push('client/lib/espo.min.js');
+            fileList.push('client/lib/espo.min.js.map');
 
             Object.keys(bundleConfig.chunks)
                 .map(name => {
-                    let namePart = name === 'main' ? 'espo' : 'espo-' + name;
+                    let namePart = 'espo-' + name;
 
                     fileList.push(`client/lib/${namePart}.min.js`);
                     fileList.push(`client/lib/${namePart}.min.js.map`);
diff --git a/js/scripts/prepare-lib-original.js b/js/scripts/prepare-lib-original.js
index d4bc028b28..6df8d59fd5 100644
--- a/js/scripts/prepare-lib-original.js
+++ b/js/scripts/prepare-lib-original.js
@@ -43,7 +43,7 @@ const originalLibCrmDir = './client/modules/crm/lib/original';
 
 let bundleFiles = Object.keys(bundleConfig.chunks)
     .map(name => {
-        let namePart = name === 'main' ? 'espo' : 'espo-' + name;
+        let namePart = 'espo-' + name;
 
         return namePart + '.js';
     });