diff --git a/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/template/template.js b/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/template/template.js
index 9821db33b49..cb3d463aaa1 100644
--- a/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/template/template.js
+++ b/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/template/template.js
@@ -23,19 +23,19 @@ exports.getTemplate = function (parameters) {
             {
                 location: "/template-form-builder-angularjs/ui/controller.js.template",
                 action: "generate",
-                rename: "gen/controller.js",
+                rename: "gen/forms/{{fileName}}/controller.js",
                 engine: "velocity",
             },
             {
                 location: "/template-form-builder-angularjs/ui/index.html.template",
                 action: "generate",
-                rename: "gen/index.html",
+                rename: "gen/forms/{{fileName}}/index.html",
                 engine: "velocity",
             },
             {
                 location: "/template-form-builder-angularjs/ui/view.js.template",
                 action: "generate",
-                rename: "gen/view.js",
+                rename: "gen/forms/{{fileName}}/view.js",
                 engine: "velocity",
             },
         ],
diff --git a/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/ui/view.js.template b/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/ui/view.js.template
index 0c5e688bb86..d9af5993a12 100644
--- a/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/ui/view.js.template
+++ b/components/template/template-form-builder-angularjs/src/main/resources/META-INF/dirigible/template-form-builder-angularjs/ui/view.js.template
@@ -8,7 +8,7 @@ const viewData = {
 	label: "$projectName Form",
 	factory: "frame",
 	region: "bottom",
-	link: "$projectName/gen/index.html",
+	link: "$projectName/gen/forms/$fileName/index.html",
 };
 if (typeof exports !== 'undefined') {
 	exports.getView = function () {
diff --git a/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/form/tsconfig.json.template b/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/form/tsconfig.json.template
index 9c17f762b78..9b957e3803b 100644
--- a/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/form/tsconfig.json.template
+++ b/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/form/tsconfig.json.template
@@ -10,10 +10,10 @@
         ],
         "paths": {
             "sdk/*": [
-                "../modules/src/*"
+                "./modules/src/*"
             ],
             "/*": [
-                "../*"
+                "./*"
             ]
         },
         "types": [
diff --git a/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/template.js b/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/template.js
index 294f700c42a..d4232904e5d 100644
--- a/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/template.js
+++ b/components/template/template-form/src/main/resources/META-INF/dirigible/template-form/template.js
@@ -5,7 +5,7 @@
  */
 exports.getTemplate = function () {
 	return {
-		name: "Form Designer (UI)",
+		name: "Form Definition (UI)",
 		description: "Form Sample Template",
 		sources: [{
 			location: "/template-form/form/project.json.template",