diff --git a/src/App.vue b/src/App.vue
index a58c5bcf6..52fd243aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -68,7 +68,7 @@ export default {
 			} else if (currentRoute.path.startsWith('/view/')) {
 				this.$store.commit('setActiveViewId', parseInt(currentRoute.params.viewId))
 				this.setPageTitle(this.$store.getters.activeView.title)
-			} else if (currentRoute.path.startsWith('/context/')) {
+			} else if (currentRoute.path.startsWith('/application/')) {
 				this.$store.commit('setActiveContextId', parseInt(currentRoute.params.contextId))
 				this.setPageTitle(this.$store.getters.activeContext.name)
 			}
diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 9491de759..05b17e396 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -3,7 +3,7 @@
 		<div class="modal__content">
 			<div class="row">
 				<div class="col-4">
-					<h2>{{ t('tables', 'Create an Application') }}</h2>
+					<h2>{{ t('tables', 'Create an application') }}</h2>
 				</div>
 			</div>
 			<div class="row space-T">
@@ -13,13 +13,13 @@
 				<div class="col-4" style="display: inline-flex;">
 					<!-- TODO replace with Context's icon picker -->
 					<NcEmojiPicker :close-on-select="true" @select="setIcon">
-						<NcButton type="tertiary" :aria-label="t('tables', 'Select icon for the Application')"
+						<NcButton type="tertiary" :aria-label="t('tables', 'Select icon for the application')"
 							:title="t('tables', 'Select icon')" @click.prevent>
 							{{ icon }}
 						</NcButton>
 					</NcEmojiPicker>
 					<input v-model="title" :class="{ missing: errorTitle }" type="text"
-						:placeholder="t('tables', 'Title of the new context')" @input="titleChangedManually">
+						:placeholder="t('tables', 'Title of the new application')" @input="titleChangedManually">
 				</div>
 			</div>
 			<div class="col-4 row space-T">
@@ -27,7 +27,7 @@
 					{{ t('tables', 'Description') }}
 				</div>
 				<input v-model="description" type="text"
-					:placeholder="t('tables', 'Description of the new Application')">
+					:placeholder="t('tables', 'Description of the new application')">
 			</div>
 			<div class="col-4 row space-T">
 				<div class="col-4">
@@ -37,8 +37,8 @@
 			</div>
 			<div class="row space-R">
 				<div class="fix-col-4 end">
-					<NcButton type="primary" :aria-label="t('tables', 'Create Application')" @click="submit">
-						{{ t('tables', 'Create Application') }}
+					<NcButton type="primary" :aria-label="t('tables', 'Create application')" @click="submit">
+						{{ t('tables', 'Create application') }}
 					</NcButton>
 				</div>
 			</div>
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 2b10ed62d..ca3cfb38d 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -1,7 +1,7 @@
 <template>
 	<NcAppNavigationItem v-if="context" data-cy="navigationContextItem" :name="context.name"
 		:class="{ active: activeContext && context.id === activeContext.id }" :force-menu="true"
-		:to="'/context/' + parseInt(context.id)">
+		:to="'/application/' + parseInt(context.id)">
 		<template #icon>
 			<template v-if="context.iconName">
 				{{ context.iconName }}
@@ -16,7 +16,7 @@
 				<template #icon>
 					<PlaylistEdit :size="20" />
 				</template>
-				{{ t('tables', 'Edit context') }}
+				{{ t('tables', 'Edit application') }}
 			</NcActionButton>
 		</template>
 	</NcAppNavigationItem>
diff --git a/src/modules/navigation/sections/Navigation.vue b/src/modules/navigation/sections/Navigation.vue
index e10b91072..da5618c41 100644
--- a/src/modules/navigation/sections/Navigation.vue
+++ b/src/modules/navigation/sections/Navigation.vue
@@ -58,9 +58,9 @@
 			</ul>
 			<div v-if="contextsLoading" class="icon-loading" />
 			<ul v-if="!contextsLoading">
-				<NcAppNavigationCaption :name="t('tables', 'Contexts')">
+				<NcAppNavigationCaption :name="t('tables', 'Applications')">
 					<template #actions>
-						<NcActionButton :aria-label="t('tables', 'Create context')" icon="icon-add"
+						<NcActionButton :aria-label="t('tables', 'Create application')" icon="icon-add"
 							@click.prevent="createContext" />
 					</template>
 				</NcAppNavigationCaption>
diff --git a/src/router.js b/src/router.js
index 567d2309b..9abf12c08 100644
--- a/src/router.js
+++ b/src/router.js
@@ -17,12 +17,12 @@ export default new Router({
 			component: Startpage,
 		},
 		{
-			path: '/context/:contextId',
+			path: '/application/:contextId',
 			component: Context,
 			name: 'context',
 		},
 		{
-			path: '/context/:contextId/row/:rowId',
+			path: '/application/:contextId/row/:rowId',
 			component: Context,
 			name: 'contextRow',
 		},