diff --git a/lib/ModuleInfo.js b/lib/ModuleInfo.js
index 82ee122..25ed282 100644
--- a/lib/ModuleInfo.js
+++ b/lib/ModuleInfo.js
@@ -7,8 +7,8 @@ const Promise = require('bluebird');
 class ModuleInfo {
 
   constructor(folderName, name, version, dependencies, postinstall) {
-    this._folderName = folderName;
     this._realFolderName = folderName;
+    this._folderName = name;
     this._name = name;
     this._version = version;
     this._dependencies = dependencies;
@@ -16,7 +16,8 @@ class ModuleInfo {
     this._isScoped = false;
 
     if (name.charAt(0) === '@') {
-      this._folderName = path.join(name.split('/')[0], folderName);
+      const moduleNameParts = name.split('/');
+      this._folderName = path.join(moduleNameParts[0], moduleNameParts[1]);
       this._isScoped = true;
     }
   }