diff --git a/public/angular/templates/incidents/index.html b/public/angular/templates/incidents/index.html
index 0f073bb1f..b3108bf9d 100644
--- a/public/angular/templates/incidents/index.html
+++ b/public/angular/templates/incidents/index.html
@@ -174,7 +174,7 @@
                   <input class="checkbox__input" ng-select-all items="incidents" title="Select All" type="checkbox"/>
                 </div>
                 <div class="btn-group mr-2" role="group" aria-label="Delete Button">
-                  <button class="btn btn-secondary" aggie-confirm="{{'Are you sure you want to delete selected incidents?' | translate}}" on-confirm="removeSelected()">
+                  <button class="btn btn-secondary" aggie-confirm="{{'Are you sure you want to delete selected groups?' | translate}}" on-confirm="removeSelected()">
                     <span class="mr-2" translate> Delete </span>
                     <i class="fa fa-trash text-light" aria-hidden="true"></i>
                   </button>
@@ -205,7 +205,7 @@
           </div>
         </div>
         <div ng-hide="pagination.total > 0" class="card-body">
-          <p  translate>Sorry, but we couldn't find any incidents.</p>
+          <p  translate>Sorry, but we couldn't find any groups.</p>
         </div>
         <div ng-include="'/templates/incidents/table.html'"></div>
       </div>
diff --git a/public/angular/templates/incidents/modal.html b/public/angular/templates/incidents/modal.html
index f6e85cf36..3e29ea516 100644
--- a/public/angular/templates/incidents/modal.html
+++ b/public/angular/templates/incidents/modal.html
@@ -1,15 +1,15 @@
 <div ng-controller="IncidentFormModalController">
   <div class="modal-header">
     <h5 class="modal-title">
-      <span class="icon-left" ng-show="incident._id == null" translate>Create Incident</span>
-      <span class="icon-left" ng-show="incident._id != null" translate>Edit Incident</span>
+      <span class="icon-left" ng-show="incident._id == null" translate>Create Group</span>
+      <span class="icon-left" ng-show="incident._id != null" translate>Edit Group</span>
     </h5>
     <button class="close" ng-click="close()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="modal-body">
-    <p ng-show="report" class="info">{{'Enter the incident details below' | translate}}<span ng-show="incidents.length">. {{'Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentSelectModalController" ng-click="setIncident(report)">{{'choose an existing incident' | translate}}</button></span>.</p>
+    <p ng-show="report" class="info">{{'Enter the group details below' | translate}}<span ng-show="incidents.length">. {{'Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentSelectModalController" ng-click="setIncident(report)">{{'choose an existing group' | translate}}</button></span>.</p>
     <div class="well bs-component">
       <form name="form">
         <fieldset>
diff --git a/public/angular/templates/incidents/report_incident_modal.html b/public/angular/templates/incidents/report_incident_modal.html
index 6ee185459..06b76c8be 100644
--- a/public/angular/templates/incidents/report_incident_modal.html
+++ b/public/angular/templates/incidents/report_incident_modal.html
@@ -1,7 +1,7 @@
 <div ng-controller="IncidentSelectModalController">
   <div class="modal-header">
     <h5 class="modal-title">
-      <div class="icon-left" translate>Add report to incident</div>
+      <div class="icon-left" translate>Add report to group</div>
     </h5>
     <button type="button" class="close" ng-click="close()" aria-label="Close">
       <span aria-hidden="true">&times;</span>
@@ -17,7 +17,7 @@ <h5 class="modal-title">
             <th scope="col" translate>Thumbnail</th>
             <th scope="col" translate>Content</th>
             <th scope="col" translate>Tags</th><!-- No need to show incident on incident detail page -->
-            <th scope="col" translate ng-hide="pageType == 'show-incident'">Incident</th><!-- No need to show incident on incident detail page -->
+            <th scope="col" translate ng-hide="pageType == 'show-incident'">Group</th><!-- No need to show incident on incident detail page -->
           </tr>
           </thead>
           <tbody class="table-bordered">
@@ -80,9 +80,9 @@ <h5 class="modal-title">
         </table>
       </div>
     </div>
-    <p ng-hide="incidents" class="info">{{"Sorry, but we couldn't find any incidents. You can" | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new incident' | translate}}</button>.</p>
+    <p ng-hide="incidents" class="info">{{"Sorry, but we couldn't find any groups. You can" | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new group' | translate}}</button>.</p>
     <div class="container-fluid" ng-show="incidents">
-      <p class='info'>{{'Click an incident below to which you would like to add the report. Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new incident' | translate}}</button>.</p>
+      <p class='info'>{{'Click an group below to which you would like to add the report. Or you can' | translate}} <button type="button" class="btn-text" ng-controller="IncidentFormModalController" ng-click="create(reports)">{{'create a new group' | translate}}</button>.</p>
       <div class="row justify-content-end">
         <ul class="list-inline mb-0">
           <li class="list-inline-item">
diff --git a/public/angular/templates/incidents/show.html b/public/angular/templates/incidents/show.html
index 18d41b92e..6a43222a3 100644
--- a/public/angular/templates/incidents/show.html
+++ b/public/angular/templates/incidents/show.html
@@ -113,7 +113,7 @@ <h4 translate>Reports</h4>
           <div ng-show="pagination.total > 0">
             <div class="btn-toolbar justify-content-between" role="toolbar" aria-label="Toolbar with selection actions" ng-show="currentUser.can('edit data')">
               <div aria-label="Read/Unread Buttons/Selection">
-                <button ng-class="{highlight: someSelected()}" class="btn btn-default" ng-click="unlinkSelected()" translate>Remove from Incident</button>
+                <button ng-class="{highlight: someSelected()}" class="btn btn-default" ng-click="unlinkSelected()" translate>Remove from Group</button>
               </div>
               <nav class="Report list page navigation">
                 <ul class="list-inline mb-0">
diff --git a/public/angular/templates/incidents/table.html b/public/angular/templates/incidents/table.html
index 109bdc21e..d05dcfe98 100644
--- a/public/angular/templates/incidents/table.html
+++ b/public/angular/templates/incidents/table.html
@@ -77,7 +77,7 @@
       </td>
       <td ng-hide="modal ||  !currentUser.can('edit data')" class="compact actions align-middle">
         <div class="fa fa-trash text-blue td__delete fa-lg"
-             aggie-confirm="{{ 'Are you sure you want to delete this incident?' | translate }}" on-confirm="delete(i)"></div>
+             aggie-confirm="{{ 'Are you sure you want to delete this group?' | translate }}" on-confirm="delete(i)"></div>
       </td>
     </tr>
     </tbody>
diff --git a/public/angular/templates/reports/batch.html b/public/angular/templates/reports/batch.html
index a764d6e78..c3c73ac34 100644
--- a/public/angular/templates/reports/batch.html
+++ b/public/angular/templates/reports/batch.html
@@ -82,7 +82,7 @@ <h4 class="card-title" translate>Batch Mode</h4>
               </div>
               <div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
                 <button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
-                  Add to Incident
+                  Add to Group
                 </button>
               </div>
             </div>
diff --git a/public/angular/templates/reports/index.html b/public/angular/templates/reports/index.html
index e5e84fec2..020d4ee21 100644
--- a/public/angular/templates/reports/index.html
+++ b/public/angular/templates/reports/index.html
@@ -76,10 +76,10 @@
               </div>
               <div class="form-group col mb-0 pb-2">
                 <div class="input-group input-group-sm">
-                  <select title="{{'Linked Incident Filter' | translate}}" ng-model="searchParams.incidentId"
+                  <select title="{{'Group Filter' | translate}}" ng-model="searchParams.incidentId"
                           ng-options="value._id as (value.title | capitalize) for (key, value) in incidents | orderObjectBy:'title'"
                           ng-change="search()" class="form-control filters__select">
-                    <option value="" translate>Linked Incident</option>
+                    <option value="" translate>Group</option>
                   </select>
                 </div>
               </div>
@@ -164,7 +164,7 @@
               </div>
               <div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
                 <button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
-                  Add to Incident
+                  Add to Group
                 </button>
               </div>
               <div class="btn-group mr-3">
@@ -203,7 +203,7 @@
               </div>
               <div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
                 <button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
-                  Add to Incident
+                  Add to Group
                 </button>
               </div>
               <div class="btn-group mr-3">
diff --git a/public/angular/templates/reports/relevant_reports.html b/public/angular/templates/reports/relevant_reports.html
index af2f8a482..790b338b1 100644
--- a/public/angular/templates/reports/relevant_reports.html
+++ b/public/angular/templates/reports/relevant_reports.html
@@ -77,7 +77,7 @@
                             </div>
                             <div class="form-group col mb-0 pb-2">
                                 <div class="input-group input-group-sm">
-                                    <select title="{{'Linked Incident Filter' | translate}}" ng-model="searchParams.incidentId"
+                                    <select title="{{'Group Filter' | translate}}" ng-model="searchParams.incidentId"
                                             ng-options="value._id as (value.title | capitalize) for (key, value) in incidents | orderObjectBy:'title'"
                                             ng-change="search()" class="form-control filters__select">
                                         <option value="" translate>Group</option>
@@ -203,14 +203,6 @@
                 <div title="Selection Actions" class="card-footer card__footer" aria-label="Bottom Selection Actions Toolbar" role="toolbar">
                     <div class="btn-toolbar justify-content-between" aria-label="Bottom Toolbar with selection actions" ng-show="currentUser.can('edit data')">
                         <div aria-label="Read/Unread Buttons/Selection">
-                            <div class="btn-group mr-3" role="group" aria-label="Read/Unread Buttons">
-                                <button title="Mark as Read/Unread" type="button" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-click="toggleSelectedRead()" translate>Read/Unread</button>
-                            </div>
-                            <div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
-                                <button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
-                                    Add to Incident
-                                </button>
-                            </div>
                         </div>
                         <nav aria-label="Bottom report list page navigation">
                             <ul class="list-inline mb-0">
diff --git a/public/angular/templates/reports/show.html b/public/angular/templates/reports/show.html
index a22aea7a7..e0d2e98e9 100644
--- a/public/angular/templates/reports/show.html
+++ b/public/angular/templates/reports/show.html
@@ -48,7 +48,7 @@ <h4 class="card-title mb-0">Report Details</h4>
                       <td colspan="10" class="detail-value">{{ report.fetchedAt | aggieDate:'datetime' }}</td>
                     </tr>
                     <tr>
-                      <th scope="row" class="detail-key" translate>Linked Incident</th>
+                      <th scope="row" class="detail-key" translate>Group</th>
                       <td colspan="10" class="detail-value align-middle">
                         <div class="text-center">
                           <a ng-controller="IncidentSelectModalController" ng-click="setIncident([report])" class="table-primary-link">
@@ -108,7 +108,7 @@ <h4 class="card-title mb-0">Comments</h4>
               </div>
               <div class="btn-group mr-3" role="group" aria-label="Incident Buttons">
                 <button type="button" ng-disabled="{{someSelected()}}" ng-class="{highlight: someSelected()}" class="btn btn-default" ng-controller="IncidentSelectModalController" ng-click="(someSelected()? setIncident():null)" translate>
-                  Add to Incident
+                  Add to Group
                 </button>
               </div>
             </div>