diff --git a/mpwo_client/src/components/Activities/ActivityAdd.jsx b/mpwo_client/src/components/Activity/ActivityAdd.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityAdd.jsx
rename to mpwo_client/src/components/Activity/ActivityAdd.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityAddOrEdit.jsx b/mpwo_client/src/components/Activity/ActivityAddOrEdit.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityAddOrEdit.jsx
rename to mpwo_client/src/components/Activity/ActivityAddOrEdit.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/ActivityCardHeader.jsx b/mpwo_client/src/components/Activity/ActivityDisplay/ActivityCardHeader.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityDisplay/ActivityCardHeader.jsx
rename to mpwo_client/src/components/Activity/ActivityDisplay/ActivityCardHeader.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/ActivityCharts.jsx b/mpwo_client/src/components/Activity/ActivityDisplay/ActivityCharts.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityDisplay/ActivityCharts.jsx
rename to mpwo_client/src/components/Activity/ActivityDisplay/ActivityCharts.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/ActivityDetails.jsx b/mpwo_client/src/components/Activity/ActivityDisplay/ActivityDetails.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityDisplay/ActivityDetails.jsx
rename to mpwo_client/src/components/Activity/ActivityDisplay/ActivityDetails.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/ActivityMap.jsx b/mpwo_client/src/components/Activity/ActivityDisplay/ActivityMap.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityDisplay/ActivityMap.jsx
rename to mpwo_client/src/components/Activity/ActivityDisplay/ActivityMap.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/index.jsx b/mpwo_client/src/components/Activity/ActivityDisplay/index.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityDisplay/index.jsx
rename to mpwo_client/src/components/Activity/ActivityDisplay/index.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityEdit.jsx b/mpwo_client/src/components/Activity/ActivityEdit.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityEdit.jsx
rename to mpwo_client/src/components/Activity/ActivityEdit.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityForms/FormWithGpx.jsx b/mpwo_client/src/components/Activity/ActivityForms/FormWithGpx.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityForms/FormWithGpx.jsx
rename to mpwo_client/src/components/Activity/ActivityForms/FormWithGpx.jsx
diff --git a/mpwo_client/src/components/Activities/ActivityForms/FormWithoutGpx.jsx b/mpwo_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/ActivityForms/FormWithoutGpx.jsx
rename to mpwo_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx
diff --git a/mpwo_client/src/components/Activities/index.jsx b/mpwo_client/src/components/Activity/index.jsx
similarity index 100%
rename from mpwo_client/src/components/Activities/index.jsx
rename to mpwo_client/src/components/Activity/index.jsx
diff --git a/mpwo_client/src/components/App.jsx b/mpwo_client/src/components/App.jsx
index 3791aad4..6e09dabf 100644
--- a/mpwo_client/src/components/App.jsx
+++ b/mpwo_client/src/components/App.jsx
@@ -3,7 +3,7 @@ import { Redirect, Route, Switch } from 'react-router-dom'
 
 import './App.css'
 import Admin from './Admin'
-import Activity from './Activities/index'
+import Activity from './Activity/index'
 import Dashboard from './Dashboard'
 import Logout from './User/Logout'
 import NavBar from './NavBar'
diff --git a/mpwo_client/src/components/Dashboard/Statistics.jsx b/mpwo_client/src/components/Dashboard/Statistics.jsx
index e07c5960..59e58388 100644
--- a/mpwo_client/src/components/Dashboard/Statistics.jsx
+++ b/mpwo_client/src/components/Dashboard/Statistics.jsx
@@ -45,7 +45,7 @@ class Statistics extends React.Component {
         </div>
         <div className="card-body">
           {Object.keys(statistics).length === 0 ? (
-            'No activities!'
+            'No workouts'
           ) : (
             <div className="chart-month">
               <div className="row chart-radio">
diff --git a/mpwo_client/src/components/Dashboard/UserStatistics.jsx b/mpwo_client/src/components/Dashboard/UserStatistics.jsx
index 80a9f87a..a132c0a6 100644
--- a/mpwo_client/src/components/Dashboard/UserStatistics.jsx
+++ b/mpwo_client/src/components/Dashboard/UserStatistics.jsx
@@ -13,7 +13,7 @@ export default function UserStatistics (props) {
             </div>
             <div className="col-9 text-right">
               <div className="huge">{user.nbActivities}</div>
-              <div>{user.nbActivities === 1 ? 'activity' : 'activities'}</div>
+              <div>{`workout${user.nbActivities !== 1 && 's'}`}</div>
             </div>
           </div>
         </div>
diff --git a/mpwo_client/src/components/NavBar/index.jsx b/mpwo_client/src/components/NavBar/index.jsx
index d63b7371..ec1fdd80 100644
--- a/mpwo_client/src/components/NavBar/index.jsx
+++ b/mpwo_client/src/components/NavBar/index.jsx
@@ -42,7 +42,7 @@ function NavBar(props) {
                       pathname: '/activities/add',
                     }}
                   >
-                    Add a workout
+                    Add workout
                   </Link>
                 </li>
               )}