diff --git a/src/App.vue b/src/App.vue
index ae177aa17..0a95a400f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -120,17 +120,17 @@
 											<icon icon="cog"/>
 										</span>
 									</router-link>
-									<router-link v-tooltip="'Add a new list in the ' + n.name + ' namespace'"
+									<router-link v-tooltip="'Add a new list in the ' + n.title + ' namespace'"
 											:to="{ name: 'newList', params: { id: n.id} }" class="nsettings"
 											:key="n.id + 'newList'" v-if="n.id > 0">
 										<span class="icon">
 											<icon icon="plus"/>
 										</span>
 									</router-link>
-									<label class="menu-label" v-tooltip="n.name + ' (' + n.lists.length + ')'" :for="n.id + 'checker'">
+									<label class="menu-label" v-tooltip="n.title + ' (' + n.lists.length + ')'" :for="n.id + 'checker'">
 										<span class="name">
 											<span class="color-bubble" v-if="n.hexColor !== ''" :style="{ backgroundColor: n.hexColor }"></span>
-											{{n.name}} ({{n.lists.length}})
+											{{n.title}} ({{n.lists.length}})
 										</span>
 										<span class="is-archived" v-if="n.isArchived">
 											Archived
diff --git a/src/components/lists/views/Kanban.vue b/src/components/lists/views/Kanban.vue
index bcff9a28a..626a6fc4b 100644
--- a/src/components/lists/views/Kanban.vue
+++ b/src/components/lists/views/Kanban.vue
@@ -71,7 +71,7 @@
 									{{ formatDateSince(task.dueDate) }}
 								</span>
 							</span>
-							<h3>{{ task.text }}</h3>
+							<h3>{{ task.title }}</h3>
 							<labels :labels="task.labels"/>
 							<div class="footer">
 								<div class="items">
@@ -348,7 +348,7 @@
 
 				const bi = bucketIndex()
 
-				const task = new TaskModel({text: this.newTaskText, bucketId: this.buckets[bi].id, listId: this.$route.params.listId})
+				const task = new TaskModel({title: this.newTaskText, bucketId: this.buckets[bi].id, listId: this.$route.params.listId})
 
 				this.taskService.create(task)
 					.then(r => {
diff --git a/src/components/lists/views/List.vue b/src/components/lists/views/List.vue
index 5d5a0325e..46e2c8772 100644
--- a/src/components/lists/views/List.vue
+++ b/src/components/lists/views/List.vue
@@ -151,7 +151,7 @@
 				}
 				this.showError = false
 
-				let task = new TaskModel({text: this.newTaskText, listId: this.$route.params.listId})
+				let task = new TaskModel({title: this.newTaskText, listId: this.$route.params.listId})
 				this.taskService.create(task)
 					.then(r => {
 						this.tasks.push(r)
diff --git a/src/components/lists/views/Table.vue b/src/components/lists/views/Table.vue
index 5c3856772..87bb1c14e 100644
--- a/src/components/lists/views/Table.vue
+++ b/src/components/lists/views/Table.vue
@@ -12,7 +12,7 @@
 					<div class="card-content">
 						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.id">#</fancycheckbox>
 						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.done">Done</fancycheckbox>
-						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.text">Name</fancycheckbox>
+						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.title">Title</fancycheckbox>
 						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.priority">Priority</fancycheckbox>
 						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.labels">Labels</fancycheckbox>
 						<fancycheckbox @change="saveTaskColumns" v-model="activeColumns.assignees">Assignees</fancycheckbox>
@@ -39,9 +39,9 @@
 					Done
 					<sort :order="sortBy.done" @click="sort('done')"/>
 				</th>
-				<th v-if="activeColumns.text">
+				<th v-if="activeColumns.title">
 					Name
-					<sort :order="sortBy.text" @click="sort('text')"/>
+					<sort :order="sortBy.title" @click="sort('title')"/>
 				</th>
 				<th v-if="activeColumns.priority">
 					Priority
@@ -90,8 +90,8 @@
 				<td v-if="activeColumns.done">
 					<div class="is-done" v-if="t.done">Done</div>
 				</td>
-				<td v-if="activeColumns.text">
-					<router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.text }}</router-link>
+				<td v-if="activeColumns.title">
+					<router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.title }}</router-link>
 				</td>
 				<td v-if="activeColumns.priority">
 					<priority-label :priority="t.priority" :show-all="true"/>
@@ -174,7 +174,7 @@
 				activeColumns: {
 					id: true,
 					done: true,
-					text: true,
+					title: true,
 					priority: false,
 					labels: true,
 					assignees: true,
diff --git a/src/components/namespaces/EditNamespace.vue b/src/components/namespaces/EditNamespace.vue
index f0bbe3202..d7875acf1 100644
--- a/src/components/namespaces/EditNamespace.vue
+++ b/src/components/namespaces/EditNamespace.vue
@@ -12,23 +12,39 @@
 			</header>
 			<div class="card-content">
 				<div class="content">
-					<form  @submit.prevent="submit()">
+					<form @submit.prevent="submit()">
 						<div class="field">
 							<label class="label" for="namespacetext">Namespace Name</label>
 							<div class="control">
-								<input v-focus :class="{ 'disabled': namespaceService.loading}" :disabled="namespaceService.loading" class="input" type="text" id="namespacetext" placeholder="The namespace text is here..." v-model="namespace.name">
+								<input
+										v-focus
+										:class="{ 'disabled': namespaceService.loading}"
+										:disabled="namespaceService.loading"
+										class="input"
+										type="text"
+										id="namespacetext"
+										placeholder="The namespace text is here..."
+										v-model="namespace.title"/>
 							</div>
 						</div>
 						<div class="field">
 							<label class="label" for="namespacedescription">Description</label>
 							<div class="control">
-								<textarea :class="{ 'disabled': namespaceService.loading}" :disabled="namespaceService.loading" class="textarea" placeholder="The namespaces description goes here..." id="namespacedescription" v-model="namespace.description"></textarea>
+								<textarea
+										:class="{ 'disabled': namespaceService.loading}"
+										:disabled="namespaceService.loading"
+										class="textarea"
+										placeholder="The namespaces description goes here..."
+										id="namespacedescription"
+										v-model="namespace.description"></textarea>
 							</div>
 						</div>
 						<div class="field">
 							<label class="label" for="isArchivedCheck">Is Archived</label>
 							<div class="control">
-								<fancycheckbox v-model="namespace.isArchived" v-tooltip="'If a namespace is archived, you cannot create new lists or edit it.'">
+								<fancycheckbox
+										v-model="namespace.isArchived"
+										v-tooltip="'If a namespace is archived, you cannot create new lists or edit it.'">
 									This namespace is archived
 								</fancycheckbox>
 							</div>
@@ -49,12 +65,14 @@
 
 					<div class="columns bigbuttons">
 						<div class="column">
-							<button @click="submit()" class="button is-primary is-fullwidth" :class="{ 'is-loading': namespaceService.loading}">
+							<button @click="submit()" class="button is-primary is-fullwidth"
+									:class="{ 'is-loading': namespaceService.loading}">
 								Save
 							</button>
 						</div>
 						<div class="column is-1">
-							<button @click="showDeleteModal = true" class="button is-danger is-fullwidth" :class="{ 'is-loading': namespaceService.loading}">
+							<button @click="showDeleteModal = true" class="button is-danger is-fullwidth"
+									:class="{ 'is-loading': namespaceService.loading}">
 								<span class="icon is-small">
 									<icon icon="trash-alt"/>
 								</span>
@@ -65,8 +83,18 @@
 			</div>
 		</div>
 
-		<component :is="manageUsersComponent" :id="namespace.id" type="namespace" shareType="user" :userIsAdmin="userIsAdmin"></component>
-		<component :is="manageTeamsComponent" :id="namespace.id" type="namespace" shareType="team" :userIsAdmin="userIsAdmin"></component>
+		<component
+				:is="manageUsersComponent"
+				:id="namespace.id"
+				type="namespace"
+				shareType="user"
+				:userIsAdmin="userIsAdmin"/>
+		<component
+				:is="manageTeamsComponent"
+				:id="namespace.id"
+				type="namespace"
+				shareType="team"
+				:userIsAdmin="userIsAdmin"/>
 
 		<modal
 				v-if="showDeleteModal"
diff --git a/src/components/namespaces/NewNamespace.vue b/src/components/namespaces/NewNamespace.vue
index 0ca4a1b7b..5290bc930 100644
--- a/src/components/namespaces/NewNamespace.vue
+++ b/src/components/namespaces/NewNamespace.vue
@@ -10,14 +10,14 @@
 				<input v-focus
 					class="input"
 					v-bind:class="{ 'disabled': namespaceService.loading}"
-					v-model="namespace.name"
+					v-model="namespace.title"
 					type="text"
 					@keyup.enter="newNamespace()"
 					@keyup.esc="back()"
 					placeholder="The namespace's name goes here..."/>
 			</p>
 			<p class="control">
-				<button class="button is-success noshadow" @click="newNamespace()" :disabled="namespace.name.length <= 5">
+				<button class="button is-success noshadow" @click="newNamespace()" :disabled="namespace.title.length <= 5">
 						<span class="icon is-small">
 							<icon icon="plus"/>
 						</span>
@@ -25,7 +25,7 @@
 				</button>
 			</p>
 		</div>
-		<p class="help is-danger" v-if="showError && namespace.name.length <= 5">
+		<p class="help is-danger" v-if="showError && namespace.title.length <= 5">
 			Please specify at least five characters.
 		</p>
 		<p class="small" v-tooltip.bottom="'A namespace is a collection of lists you can share and use to organize your lists with.<br/>In fact, every list belongs to a namepace.'">
@@ -55,7 +55,7 @@
 		},
 		methods: {
 			newNamespace() {
-				if (this.namespace.name.length <= 4) {
+				if (this.namespace.title.length <= 4) {
 					this.showError = true
 					return
 				}
diff --git a/src/components/tasks/TaskDetailView.vue b/src/components/tasks/TaskDetailView.vue
index 57c7fe2bc..d79a61b9b 100644
--- a/src/components/tasks/TaskDetailView.vue
+++ b/src/components/tasks/TaskDetailView.vue
@@ -7,10 +7,10 @@
 				</h1>
 				<div class="is-done" v-if="task.done">Done</div>
 				<h1 class="title input" contenteditable="true" @focusout="saveTaskOnChange()" ref="taskTitle"
-					@keyup.ctrl.enter="saveTaskOnChange()">{{ task.text }}</h1>
+					@keyup.ctrl.enter="saveTaskOnChange()">{{ task.title }}</h1>
 			</div>
 			<h6 class="subtitle" v-if="parent && parent.namespace && parent.list">
-				{{ parent.namespace.name }} >
+				{{ parent.namespace.title }} >
 				<router-link :to="{ name: 'list.list', params: { listId: parent.list.id } }">
 					{{ parent.list.title }}
 				</router-link>
@@ -410,7 +410,7 @@
 				this.taskService.get({id: this.taskId})
 					.then(r => {
 						this.$set(this, 'task', r)
-						this.taskTitle = this.task.text
+						this.taskTitle = this.task.title
 						this.setActiveFields()
 					})
 					.catch(e => {
@@ -444,13 +444,13 @@
 
 				// Pull the task title from the contenteditable
 				let taskTitle = this.$refs.taskTitle.textContent
-				this.task.text = taskTitle
+				this.task.title = taskTitle
 
 				// We only want to save if the title was actually change.
 				// Because the contenteditable does not have a change event,
 				// we're building it ourselves and only calling saveTask()
 				// if the task title changed.
-				if (this.task.text !== this.taskTitle) {
+				if (this.task.title !== this.taskTitle) {
 					this.saveTask()
 					this.taskTitle = taskTitle
 				}
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 454d64d13..37155ee5d 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -50,7 +50,7 @@
 					'has-high-priority': t.priority >= priorities.HIGH,
 					'has-not-so-high-priority': t.priority === priorities.HIGH,
 					'has-super-high-priority': t.priority === priorities.DO_NOW
-					}">{{t.text}}</span>
+					}">{{t.title}}</span>
 					<priority-label :priority="t.priority"/>
 					<!-- using the key here forces vue to use the updated version model and not the response returned by the api -->
 					<a @click="editTask(theTasks[k])" class="edit-toggle">
@@ -78,7 +78,7 @@
 							@clicked="setTaskDragged(t)"
 							v-tooltip="'This task has no dates set.'"
 					>
-						<span>{{t.text}}</span>
+						<span>{{t.title}}</span>
 					</VueDragResize>
 				</div>
 			</template>
@@ -366,7 +366,7 @@
 				if (!this.newTaskFieldActive) {
 					return
 				}
-				let task = new TaskModel({text: this.newTaskTitle, listId: this.listId})
+				let task = new TaskModel({title: this.newTaskTitle, listId: this.listId})
 				this.taskService.create(task)
 					.then(r => {
 						this.tasksWithoutDates.push(this.addGantAttributes(r))
diff --git a/src/components/tasks/reusable/relatedTasks.vue b/src/components/tasks/reusable/relatedTasks.vue
index 2a61e9c2e..1662e9e59 100644
--- a/src/components/tasks/reusable/relatedTasks.vue
+++ b/src/components/tasks/reusable/relatedTasks.vue
@@ -53,7 +53,7 @@
 								<span v-if="t.listId !== listId" class="different-list" v-tooltip="'This task belongs to a different list.'">
 									{{ $store.getters['lists/getListById'](t.listId) === null ? '' : $store.getters['lists/getListById'](t.listId).title }} >
 								</span>
-								{{t.text}}
+								{{t.title}}
 							</span>
 						</router-link>
 						<a
@@ -202,8 +202,8 @@
 						this.showDeleteModal = false
 					})
 			},
-			createAndRelateTask(text) {
-				const newTask = new TaskModel({text: text, listId: this.listId})
+			createAndRelateTask(title) {
+				const newTask = new TaskModel({title: title, listId: this.listId})
 				this.taskService.create(newTask)
 					.then(r => {
 						this.newTaskRelationTask = r
diff --git a/src/components/tasks/reusable/singleTaskInList.vue b/src/components/tasks/reusable/singleTaskInList.vue
index 370e3ff52..d3c724777 100644
--- a/src/components/tasks/reusable/singleTaskInList.vue
+++ b/src/components/tasks/reusable/singleTaskInList.vue
@@ -14,11 +14,11 @@
 			<!-- Show any parent tasks to make it clear this task is a sub task of something -->
 			<span class="parent-tasks" v-if="typeof task.relatedTasks.parenttask !== 'undefined'">
 				<template v-for="(pt, i) in task.relatedTasks.parenttask">
-					{{ pt.text }}<template v-if="(i + 1) < task.relatedTasks.parenttask.length">,&nbsp;</template>
+					{{ pt.title }}<template v-if="(i + 1) < task.relatedTasks.parenttask.length">,&nbsp;</template>
 				</template>
 				>
 			</span>
-			{{ task.text }}
+			{{ task.title }}
 			<labels :labels="task.labels"/>
 			<user
 					:user="a"
diff --git a/src/models/namespace.js b/src/models/namespace.js
index 3bb1dedb7..928692029 100644
--- a/src/models/namespace.js
+++ b/src/models/namespace.js
@@ -23,7 +23,7 @@ export default class NamespaceModel extends AbstractModel {
 	defaults() {
 		return {
 			id: 0,
-			name: '',
+			title: '',
 			description: '',
 			owner: UserModel,
 			lists: [],