diff --git a/demo-shell-ng2/config/loaders/system.js b/demo-shell-ng2/config/loaders/system.js
index 2775093851..836b205604 100644
--- a/demo-shell-ng2/config/loaders/system.js
+++ b/demo-shell-ng2/config/loaders/system.js
@@ -1,15 +1,22 @@
 const moduleIdRegex = /moduleId: module.id,/g;
+const moduleNameRegex = /moduleId: __moduleName,/g;
 
 module.exports = function(source) {
     this.cacheable();
 
     let result = source;
-    let modified = false;
+
     if (moduleIdRegex.test(source)) {
         result = source.replace(moduleIdRegex, (match) => {
             return `// ${match}`;
         });
-        // console.log(result);
     }
+
+    if (moduleNameRegex.test(source)) {
+        result = source.replace(moduleNameRegex, (match) => {
+            return `// ${match}`;
+        });
+    }
+
     return result;
 }