diff --git a/core/examples/luigi-sample-angular/angular.json b/core/examples/luigi-sample-angular/angular.json
index b4b521c907..a50eb437da 100644
--- a/core/examples/luigi-sample-angular/angular.json
+++ b/core/examples/luigi-sample-angular/angular.json
@@ -23,17 +23,17 @@
               {
                 "glob": "fiori-fundamentals.min.css",
                 "input": "node_modules/fiori-fundamentals/dist",
-                "output": "/fundamental-ui"
+                "output": "/fiori-fundamentals"
               },
               {
                 "glob": "fonts/**",
                 "input": "node_modules/fiori-fundamentals/dist",
-                "output": "/fundamental-ui"
+                "output": "/fiori-fundamentals"
               },
               {
                 "glob": "SAP-icons.*",
                 "input": "node_modules/fiori-fundamentals/dist",
-                "output": "/fundamental-ui"
+                "output": "/fiori-fundamentals"
               },
               {
                 "glob": "**",
diff --git a/core/examples/luigi-sample-angular/package.json b/core/examples/luigi-sample-angular/package.json
index fd7d0dee1e..96862f67df 100644
--- a/core/examples/luigi-sample-angular/package.json
+++ b/core/examples/luigi-sample-angular/package.json
@@ -26,8 +26,8 @@
     "ajv": "^6.1.1",
     "core-js": "^2.4.1",
     "fiori-fundamentals": "^1.3.2",
-    "@kyma-project/luigi-core": "^0.3.8",
-    "@kyma-project/luigi-client": "^0.3.8",
+    "@kyma-project/luigi-core": "^0.4.0",
+    "@kyma-project/luigi-client": "^0.4.0",
     "zone.js": "^0.8.14",
     "rxjs": "^6.2.0"
   },
diff --git a/core/examples/luigi-sample-angular/src/app/app.component.scss b/core/examples/luigi-sample-angular/src/app/app.component.scss
index 0535e05c03..47b19678e5 100644
--- a/core/examples/luigi-sample-angular/src/app/app.component.scss
+++ b/core/examples/luigi-sample-angular/src/app/app.component.scss
@@ -1,2 +1,2 @@
-$fd-scss-font-path: '~fundamental-ui/scss/fonts/';
-$fd-icons-path: '~fundamental-ui/scss/icons/';
+$fd-scss-font-path: '~fiori-fundamentals/scss/fonts/';
+$fd-icons-path: '~fiori-fundamentals/scss/icons/';
diff --git a/core/examples/luigi-sample-angular/src/logout.html b/core/examples/luigi-sample-angular/src/logout.html
index 3b95e48780..6848552500 100644
--- a/core/examples/luigi-sample-angular/src/logout.html
+++ b/core/examples/luigi-sample-angular/src/logout.html
@@ -8,7 +8,7 @@
   <title>Logout successful</title>
   <meta name="description" content="">
   <meta name="keywords" content="logout">
-  <link rel='stylesheet' href='/fundamental-ui/fiori-fundamentals.min.css'>
+  <link rel='stylesheet' href='/fiori-fundamentals/fiori-fundamentals.min.css'>
 
   <style>
     .sap-icon--log::before {
diff --git a/docs/application-setup.md b/docs/application-setup.md
index 124ee59aaa..c1410003a8 100644
--- a/docs/application-setup.md
+++ b/docs/application-setup.md
@@ -44,7 +44,7 @@ npm install -g live-server
 ````
 $ mkdir my-plain-app && cd my-plain-app
 $ npm init -y
-$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fundamental-ui@latest
+$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fiori-fundamentals@latest
 $ mkdir -p public/assets
 $ curl https://raw.githubusercontent.com/kyma-project/Luigi/master/core/examples/luigi-sample-angular/src/index.html > public/index.html
 $ curl https://raw.githubusercontent.com/kyma-project/Luigi/master/core/examples/luigi-sample-angular/src/assets/sampleexternal.html > public/assets/temp.html
@@ -65,7 +65,7 @@ $ live-server --entry-file=index.html public
 
 ````
 $ ng new my-dream-app --routing && cd my-dream-app
-$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fundamental-ui@latest
+$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fiori-fundamentals@latest
 $ mv src/index.html src/angular.html
 $ curl https://raw.githubusercontent.com/kyma-project/Luigi/master/core/examples/luigi-sample-angular/src/index.html > src/index.html
 $ curl https://raw.githubusercontent.com/kyma-project/Luigi/master/core/examples/luigi-sample-angular/src/assets/basicConfiguration.js > src/assets/sampleconfig.js
@@ -90,7 +90,7 @@ npm install -g live-server
 ````
 $ mkdir my-ui5-app && cd my-ui5-app
 $ npm init -y
-$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fundamental-ui@latest
+$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fiori-fundamentals@latest
 $ mkdir -p public/assets
 $ curl https://raw.githubusercontent.com/kyma-project/Luigi/master/core/examples/luigi-sample-angular/src/index.html > public/index.html
 $ curl https://raw.githubusercontent.com/SAP/openui5/master/src/sap.m/test/sap/m/demokit/helloworld/index.html  | sed 's/src="..\/..\/..\/..\/..\/resources\/sap-ui-core.js"/src="https:\/\/openui5.hana.ondemand.com\/resources\/sap-ui-core.js"/g' > public/ui5.html
@@ -116,7 +116,7 @@ npm install -g @vue/cli
 
 ````
 $ vue create -d my-vue-app && cd my-vue-app
-$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fundamental-ui@latest
+$ npm i -S @kyma-project/luigi-core@latest @kyma-project/luigi-client@latest fiori-fundamentals@latest
 $ mkdir -p public/assets
 $ mv public/index.html public/vue.html
 $ curl https://raw.githubusercontent.com/kyma-project/Luigi/master/core/examples/luigi-sample-angular/src/index.html > public/index.html