diff --git a/src/Model/Files/boardModel.ts b/src/Model/Files/boardsAndTasksModel.ts
similarity index 97%
rename from src/Model/Files/boardModel.ts
rename to src/Model/Files/boardsAndTasksModel.ts
index 64c40c4e..0615c37b 100644
--- a/src/Model/Files/boardModel.ts
+++ b/src/Model/Files/boardsAndTasksModel.ts
@@ -12,7 +12,7 @@ import { Color } from "../../colors";
 import { HandlerManager } from "../Utility/utility";
 import StorageModel from "../Global/storageModel";
 
-export default class BoardModel {
+export default class BoardsAndTasksModel {
   storageModel: StorageModel;
   chatModel: ChatModel;
   fileModel: FileModel;
@@ -83,7 +83,7 @@ export default class BoardModel {
   // boards
   createBoard = (name: string): BoardInfoFileContent => {
     const boardInfoFileContent: BoardInfoFileContent =
-      BoardModel.createBoardInfoFileContent(v4(), name, Color.Standard);
+      BoardsAndTasksModel.createBoardInfoFileContent(v4(), name, Color.Standard);
     return boardInfoFileContent;
   };
 
@@ -133,7 +133,7 @@ export default class BoardModel {
 
   //tasks
   createTask = (boardId: string): TaskFileContent => {
-    const taskFileContent: TaskFileContent = BoardModel.createTaskFileContent(
+    const taskFileContent: TaskFileContent = BoardsAndTasksModel.createTaskFileContent(
       v4(),
       "",
       boardId
diff --git a/src/Model/Files/fileModel.ts b/src/Model/Files/fileModel.ts
index ee1e4352..42f7c795 100644
--- a/src/Model/Files/fileModel.ts
+++ b/src/Model/Files/fileModel.ts
@@ -9,7 +9,7 @@ import {
 } from "../Utility/utility";
 import StorageModel, { filePaths } from "../Global/storageModel";
 
-import BoardModel from "./boardModel";
+import BoardsAndTasksModel from "./boardsAndTasksModel";
 import ChatModel from "../Chat/chatModel";
 import { v4 } from "uuid";
 
@@ -17,7 +17,7 @@ export default class FileModel {
   chatModel: ChatModel;
   storageModel: StorageModel;
 
-  taskModel: BoardModel;
+  boardsAndTasksModel: BoardsAndTasksModel;
 
   fileContentHandlerManager: HandlerManager<FileContent<string>> = new HandlerManager();
 
@@ -63,7 +63,7 @@ export default class FileModel {
     const didStore: boolean = this.storeFileContent(fileContent);
     if (didStore == false) return;
 
-    this.taskModel.handleFileContent(fileContent);
+    this.boardsAndTasksModel.handleFileContent(fileContent);
     this.fileContentHandlerManager.trigger(fileContent);
   };
 
@@ -140,7 +140,7 @@ export default class FileModel {
     this.chatModel = chatModel;
     this.storageModel = storageModel;
 
-    this.taskModel = new BoardModel(this.storageModel, chatModel, this);
+    this.boardsAndTasksModel = new BoardsAndTasksModel(this.storageModel, chatModel, this);
   }
 
   // utility
diff --git a/src/ViewModel/Chat/chatViewModel.ts b/src/ViewModel/Chat/chatViewModel.ts
index fb018dbe..1550fc2f 100644
--- a/src/ViewModel/Chat/chatViewModel.ts
+++ b/src/ViewModel/Chat/chatViewModel.ts
@@ -91,7 +91,7 @@ export default class ChatViewModel {
     // page viewModels
     this.taskPageViewModel = new TaskPageViewModel(
       this.storageModel,
-      this.chatModel.fileModel.taskModel,
+      this.chatModel.fileModel.boardsAndTasksModel,
       this
     );
     this.messagePageViewModel = new MessagePageViewModel(this);
diff --git a/src/ViewModel/Pages/boardViewModel.ts b/src/ViewModel/Pages/boardViewModel.ts
index 0e56c822..c4f93b8d 100644
--- a/src/ViewModel/Pages/boardViewModel.ts
+++ b/src/ViewModel/Pages/boardViewModel.ts
@@ -1,9 +1,9 @@
 import * as React from "bloatless-react";
 
-import BoardModel, {
+import BoardsAndTasksModel, {
   BoardInfoFileContent,
   TaskFileContent,
-} from "../../Model/Files/boardModel";
+} from "../../Model/Files/boardsAndTasksModel";
 
 import { Color } from "../../colors";
 import { IndexManager } from "../../Model/Utility/utility";
@@ -13,7 +13,7 @@ import TaskViewModel from "./taskViewModel";
 
 export default class BoardViewModel {
   storageModel: StorageModel;
-  boardModel: BoardModel;
+  boardModel: BoardsAndTasksModel;
 
   taskPageViewModel: TaskPageViewModel;
 
@@ -54,7 +54,7 @@ export default class BoardViewModel {
   // settings
   saveSettings = (): void => {
     const newBoardInfoFileContent: BoardInfoFileContent =
-      BoardModel.createBoardInfoFileContent(
+      BoardsAndTasksModel.createBoardInfoFileContent(
         this.boardInfo.fileId,
         this.name.value,
         this.color.value
@@ -197,7 +197,7 @@ export default class BoardViewModel {
   // init
   constructor(
     storageModel: StorageModel,
-    boardModel: BoardModel,
+    boardModel: BoardsAndTasksModel,
     taskPageViewModel: TaskPageViewModel,
     boardInfo: BoardInfoFileContent
   ) {
diff --git a/src/ViewModel/Pages/taskPageViewModel.ts b/src/ViewModel/Pages/taskPageViewModel.ts
index dcc39429..e42611bf 100644
--- a/src/ViewModel/Pages/taskPageViewModel.ts
+++ b/src/ViewModel/Pages/taskPageViewModel.ts
@@ -1,6 +1,6 @@
 import * as React from "bloatless-react";
 
-import BoardModel, { BoardInfoFileContent } from "../../Model/Files/boardModel";
+import BoardsAndTasksModel, { BoardInfoFileContent } from "../../Model/Files/boardsAndTasksModel";
 
 import BoardViewModel from "./boardViewModel";
 import ChatViewModel from "../Chat/chatViewModel";
@@ -9,7 +9,7 @@ import StorageModel from "../../Model/Global/storageModel";
 
 export default class TaskPageViewModel {
   storageModel: StorageModel;
-  boardModel: BoardModel;
+  boardModel: BoardsAndTasksModel;
 
   chatViewModel: ChatViewModel;
 
@@ -141,7 +141,7 @@ export default class TaskPageViewModel {
   // init
   constructor(
     storageModel: StorageModel,
-    boardModel: BoardModel,
+    boardModel: BoardsAndTasksModel,
     chatViewModel: ChatViewModel
   ) {
     this.storageModel = storageModel;
diff --git a/src/ViewModel/Pages/taskViewModel.ts b/src/ViewModel/Pages/taskViewModel.ts
index 97cac522..683527e4 100644
--- a/src/ViewModel/Pages/taskViewModel.ts
+++ b/src/ViewModel/Pages/taskViewModel.ts
@@ -1,12 +1,12 @@
 import * as React from "bloatless-react";
 
-import BoardModel, { TaskFileContent } from "../../Model/Files/boardModel";
+import BoardsAndTasksModel, { TaskFileContent } from "../../Model/Files/boardsAndTasksModel";
 import { localeCompare, padZero } from "../../Model/Utility/utility";
 
 import BoardViewModel from "./boardViewModel";
 
 export default class TaskViewModel {
-  boardModel: BoardModel;
+  boardModel: BoardsAndTasksModel;
 
   boardViewModel: BoardViewModel;
 
@@ -74,7 +74,7 @@ export default class TaskViewModel {
   // settings
   save = (): void => {
     const newTaskFileContent: TaskFileContent =
-      BoardModel.createTaskFileContent(
+      BoardsAndTasksModel.createTaskFileContent(
         this.task.fileId,
         this.name.value,
         this.task.boardId
@@ -138,7 +138,7 @@ export default class TaskViewModel {
 
   // init
   constructor(
-    boardModel: BoardModel,
+    boardModel: BoardsAndTasksModel,
     boardViewModel: BoardViewModel,
     taskFileContent: TaskFileContent
   ) {