diff --git a/README.md b/README.md
index a2f46245..6833ad36 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ https://doi.org/10.1016/j.buildenv.2022.109166
 
 ## Applications
 
-### COVID Calculator
+### Calculator
 
 A risk assessment tool which simulates the airborne spread of the SARS-CoV-2 virus for space managers.
 
@@ -94,7 +94,7 @@ CAiMIRA is also mirrored to Github if you wish to collaborate on development and
 pip install -e .   # At the root of the repository
 ```
 
-### Running the COVID calculator app in development mode
+### Running the Calculator app in development mode
 
 ```
 python -m cara.apps.calculator
diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2
index db9fd383..dc177114 100644
--- a/cara/apps/templates/base/calculator.form.html.j2
+++ b/cara/apps/templates/base/calculator.form.html.j2
@@ -625,7 +625,7 @@
     <li>If coffee breaks are included, they are spread out evenly throughout the day,
     in addition to any lunch break (if applicable).</li>
   </ul>
-  Refer to <a href="{{ calculator_prefix }}/user-guide"> COVID Calculator App user guide </a>
+  Refer to <a href="{{ calculator_prefix }}/user-guide"> Calculator App user guide </a>
   for more detailed explanations on how to use this tool. <br>
 </div>
 
diff --git a/cara/apps/templates/base/layout.html.j2 b/cara/apps/templates/base/layout.html.j2
index 25345662..3bc7083c 100644
--- a/cara/apps/templates/base/layout.html.j2
+++ b/cara/apps/templates/base/layout.html.j2
@@ -41,14 +41,14 @@
                 Apps
               </a>
               <ul class="dropdown-menu dropwown-navbar-colors text-right" style="min-width: 12rem;" aria-labelledby="navbarDropdown">
-                <li><a href="{{ calculator_prefix }}" class="{{ "header-navbar nav-link active" if "calculator/" == active_page else "header-navbar nav-link" }}">COVID Calculator</a></li>
+                <li><a href="{{ calculator_prefix }}" class="{{ "header-navbar nav-link active" if "calculator/" == active_page else "header-navbar nav-link" }}">Calculator</a></li>
                 <li><a href="{{ calculator_prefix }}/user-guide" style="margin-left: 2rem" class="{{ "header-navbar nav-link active" if "user-guide" in active_page else "header-navbar nav-link" }}">User Guide</a></li>
                 <li><a href="/expert-app" class="{{ "header-navbar nav-link active" if "/expert-app" == active_page else "header-navbar nav-link" }}">Expert app (beta)</a></li>
               </ul>
             </li>
           </div>
           <div id="mobile_calculator_option">
-            <li class="nav-link"><a href="{{ calculator_prefix }}" class="{{ "header-navbar nav-link active" if "calculator/" == active_page else "header-navbar nav-link" }}">COVID Calculator</a></li>
+            <li class="nav-link"><a href="{{ calculator_prefix }}" class="{{ "header-navbar nav-link active" if "calculator/" == active_page else "header-navbar nav-link" }}">Calculator</a></li>
             <li class="nav-link"><a href="{{ calculator_prefix }}/user-guide" class="{{ "header-navbar nav-link active" if "user-guide" in active_page else "header-navbar nav-link" }}">User Guide</a></li>
           </div>
           {% block covid_information%}
diff --git a/cara/apps/templates/cern/index.html.j2 b/cara/apps/templates/cern/index.html.j2
index 692aeb67..28c4b1ef 100644
--- a/cara/apps/templates/cern/index.html.j2
+++ b/cara/apps/templates/cern/index.html.j2
@@ -5,7 +5,7 @@
 <div>
   <p>
   CAiMIRA has been developed by CERN with the intention of allowing members of personnel with roles related to supervision, health & safety or space management to simulate the concerned workplaces on CERN sites.
-  A hosted <a href="{{ calculator_prefix }}">CERN version of the CAiMIRA Covid Calculator</a> is available on this site to members of the CERN personnel.
+  A hosted <a href="{{ calculator_prefix }}">CERN version of the CAiMIRA Calculator</a> is available on this site to members of the CERN personnel.
   </p>
 </div>
 {% endblock cara_at_cern %}
\ No newline at end of file