diff --git a/app/router.js b/app/router.js
index 211b13269183bfe32395e7eb19fb39a9c252544a..2d1a97b70a2616ce758c964e88dfadbfcfd725a3 100644
--- a/app/router.js
+++ b/app/router.js
@@ -7,7 +7,7 @@ const Router = Ember.Router.extend({
 
 Router.map(function() {
     this.route('home', {path: '/'});
-    this.route('architectures', function() {
+    this.route('deployments', function() {
         this.route('single', {path: '/:systemId'}, function() {
             this.route('details', {path: '/:entityType/:entityId'}); // use model properties for automatic matching
         });
diff --git a/app/routes/architectures/index.js b/app/routes/deployments/index.js
similarity index 100%
rename from app/routes/architectures/index.js
rename to app/routes/deployments/index.js
diff --git a/app/routes/architectures/single.js b/app/routes/deployments/single.js
similarity index 95%
rename from app/routes/architectures/single.js
rename to app/routes/deployments/single.js
index b89ac00578ac47d9a8940b3b3d6c1a86a555f63e..cd7c872bbad8fe0eba11682aa195cbb6df411a3b 100644
--- a/app/routes/architectures/single.js
+++ b/app/routes/deployments/single.js
@@ -38,7 +38,7 @@ export default Ember.Route.extend({
         /* I would love to not generate the url first, but there seem to be unknown (to me) assumptions about
         * passing object parameters to transitionTo which break with the current path variables.
         */
-        const url = this.router.generate('architectures.single.details', {
+        const url = this.router.generate('deployments.single.details', {
             systemId: this.get('session.systemId'),
             entityType,
             entityId
diff --git a/app/routes/architectures/single/details.js b/app/routes/deployments/single/details.js
similarity index 100%
rename from app/routes/architectures/single/details.js
rename to app/routes/deployments/single/details.js
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index b8ae549014bb1f1b3f35c8a9bb230056a16adcdb..f0b84fbf38f2dc399eca7c6133272691614fd529 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -16,8 +16,8 @@
         {{#link-to 'home' tagName='li'}}
             {{#link-to 'home'}}Startseite{{/link-to}}
         {{/link-to}}
-        {{#link-to 'architectures' tagName='li'}}
-            {{#link-to 'architectures'}}Architekturen{{/link-to}}
+        {{#link-to 'deployments' tagName='li'}}
+            {{#link-to 'deployments'}}Deployments{{/link-to}}
         {{/link-to}}
       </ul>
     </div><!--/.nav-collapse -->
diff --git a/app/templates/architectures/index.hbs b/app/templates/architectures/index.hbs
deleted file mode 100644
index dbc342d382fc0bdcc3178c5fdd00f21864086cd5..0000000000000000000000000000000000000000
--- a/app/templates/architectures/index.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{model.length}}
-
-<ul>
-{{#each model as |system| }}
-    <li>{{#link-to 'architectures.single' system.id}}{{system.name}}{{/link-to}}</li>
-{{/each}}
-</ul>
-
-{{outlet}}
\ No newline at end of file
diff --git a/app/templates/architectures.hbs b/app/templates/deployments.hbs
similarity index 100%
rename from app/templates/architectures.hbs
rename to app/templates/deployments.hbs
diff --git a/app/templates/deployments/index.hbs b/app/templates/deployments/index.hbs
new file mode 100644
index 0000000000000000000000000000000000000000..9cfa810146a0c5648d34fbc866e2fefd590b8e20
--- /dev/null
+++ b/app/templates/deployments/index.hbs
@@ -0,0 +1,9 @@
+{{model.length}}
+
+<ul>
+{{#each model as |system| }}
+    <li>{{#link-to 'deployments.single' system.id}}{{system.name}}{{/link-to}}</li>
+{{/each}}
+</ul>
+
+{{outlet}}
\ No newline at end of file
diff --git a/app/templates/architectures/single.hbs b/app/templates/deployments/single.hbs
similarity index 100%
rename from app/templates/architectures/single.hbs
rename to app/templates/deployments/single.hbs
diff --git a/app/templates/architectures/single/details.hbs b/app/templates/deployments/single/details.hbs
similarity index 100%
rename from app/templates/architectures/single/details.hbs
rename to app/templates/deployments/single/details.hbs