diff --git a/src/app/core/models/issue.model.ts b/src/app/core/models/issue.model.ts
index 19af1f018..7233a35b8 100644
--- a/src/app/core/models/issue.model.ts
+++ b/src/app/core/models/issue.model.ts
@@ -24,7 +24,7 @@ export class Issue {
   author: string;
   isDraft: boolean;
 
-  /** Depending on the phase, assignees attribute can be derived from Github's assignee feature OR from the Github's issue description */
+  /** Depending on the view, assignees attribute can be derived from Github's assignee feature OR from the Github's issue description */
   assignees?: string[];
   labels?: string[];
   githubLabels?: GithubLabel[];
diff --git a/src/app/issues-viewer/issues-viewer.component.ts b/src/app/issues-viewer/issues-viewer.component.ts
index 8f030de46..a701f0d80 100644
--- a/src/app/issues-viewer/issues-viewer.component.ts
+++ b/src/app/issues-viewer/issues-viewer.component.ts
@@ -83,7 +83,7 @@ export class IssuesViewerComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   /**
-   * Checks if our current repository available on phase service is indeed a valid repository
+   * Checks if our current repository available on view service is indeed a valid repository
    */
   private checkIfValidRepository() {
     const currentRepo = this.viewService.currentRepo;
diff --git a/tests/app/core/models/session-model.spec.ts b/tests/app/core/models/session-model.spec.ts
index 9d665eac3..da3a63731 100644
--- a/tests/app/core/models/session-model.spec.ts
+++ b/tests/app/core/models/session-model.spec.ts
@@ -41,8 +41,8 @@ describe('Session Model', () => {
         });
     });
 
-    it('should throw error on session with invalid phases', () => {
-      of({ sessionRepo: [{ view: 'invalidPhase' as View, repos: [WATCHER_REPO] }] })
+    it('should throw error on session with invalid views', () => {
+      of({ sessionRepo: [{ view: 'invalidView' as View, repos: [WATCHER_REPO] }] })
         .pipe(assertSessionDataIntegrity())
         .subscribe({
           next: () => fail(),
diff --git a/tests/constants/label.constants.ts b/tests/constants/label.constants.ts
index c49188af7..4322cf412 100644
--- a/tests/constants/label.constants.ts
+++ b/tests/constants/label.constants.ts
@@ -53,7 +53,7 @@ export const LIGHT_BG_DARK_TEXT = {
   color: `#${COLOR_BLACK}`
 };
 
-// Constant array of labels for team response phase and moderation phase to simulate Github response
+// Constant array of labels for team response view and moderation view to simulate Github response
 export const SEVERITY_LABELS = [
   {
     name: LABEL_NAME_SEVERITY_VERY_LOW,
diff --git a/tests/services/view.service.spec.ts b/tests/services/view.service.spec.ts
index 29156902b..e1a286ed2 100644
--- a/tests/services/view.service.spec.ts
+++ b/tests/services/view.service.spec.ts
@@ -38,7 +38,7 @@ describe('ViewService', () => {
       expect(currentSessionRepo?.repos).toEqual([WATCHER_REPO, CATCHER_REPO]);
     });
 
-    it('should store phase details via githubService and update localStorage', () => {
+    it('should store view details via githubService and update localStorage', () => {
       const localStorageSetItem = spyOn(localStorage, 'setItem');
 
       viewService.setRepository(WATCHER_REPO);
@@ -127,8 +127,8 @@ describe('ViewService', () => {
     });
   });
 
-  describe('changeView(Phase)', () => {
-    it('should set current phase', () => {
+  describe('changeView(View)', () => {
+    it('should set current view', () => {
       viewService.setRepository(WATCHER_REPO);
 
       expect(viewService.currentView).toEqual(View.issuesViewer);