diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f3310bac..ab2d570a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changelog Fab Manager
+# Changelog Fab-manager
 
 - Ability to create and delete periodic calendar availabilities (recurrence)
 - Ability to fully customize the home page
@@ -37,6 +37,7 @@
 - Unified translations syntax to use ICU MessageFormat
 - Refactored front-end translations keys with unified paths
 - Updated and refactored README and documentations
+- Harmonized Fab-manager typography and case
 - Fix a bug: unable to remove the picture from a training
 - Fix a bug: no alerts on errors during admin creation
 - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134]
diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
index 7ca896b4c..7e178619e 100644
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@@ -132,7 +132,7 @@
       <i class="fa fa-refresh pointer" aria-label="Upgrade required" ng-show="!version.up_to_date && !version.security"></i>
       <i class="fa fa-warning pointer" aria-label="Security upgrade required" ng-show="!version.up_to_date && version.security"></i>
     </span>
-    <span class="text-sm">Powered by <a href="http://www.fab-manager.com" target="_blank">Fab Manager</a></span>
+    <span class="text-sm">Powered by <a href="http://www.fab-manager.com" target="_blank">Fab-manager</a></span>
   </div>
 
 <%= javascript_include_tag 'application' %>
diff --git a/config/application.yml.default b/config/application.yml.default
index fb323766c..4b71db9fd 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -28,7 +28,7 @@ EVENTS_IN_CALENDAR: 'false'
 SLOT_DURATION: '60'
 FEATURE_TOUR_DISPLAY: 'once'
 
-DEFAULT_MAIL_FROM: Fab Manager Demo <noreply@fab-manager.com>
+DEFAULT_MAIL_FROM: Fab-manager Demo <noreply@fab-manager.com>
 
 # Configure carefully!
 DEFAULT_HOST: 'localhost:5000'
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml
index 4516b71f7..5d7528a4f 100644
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@@ -171,7 +171,7 @@ en:
         # projects gallery
         the_fablab_projects: "The Fab Lab projects"
         add_a_project: "Add a project"
-        search_over_the_whole_network: "Search over the whole Fab Manager network"
+        search_over_the_whole_network: "Search over the whole Fab-manager network"
         tooltip_openlab_projects_switch: "The search over the whole network lets you search over the projects of every Fab-manager using this feature !"
         openlab_search_not_available_at_the_moment: "Search over the whole network is not available at the moment. You still can search over the projects of this platform."
         project_search_result_is_empty: "Sorry, we found no results matching your search criteria."
diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml
index 7fe310de7..9dc33a8b7 100644
--- a/config/locales/app.public.fr.yml
+++ b/config/locales/app.public.fr.yml
@@ -174,7 +174,7 @@ fr:
         # galerie des projets
         the_fablab_projects: "Les projets du FabLab"
         add_a_project: "Ajouter un projet"
-        search_over_the_whole_network: "Chercher sur tout le réseau Fab Manager"
+        search_over_the_whole_network: "Chercher sur tout le réseau Fab-manager"
         tooltip_openlab_projects_switch: "La recherche sur tout le réseau vous permet de rechercher parmis les projets de tous les Fab-managers utilisant cette fonctionnalité !"
         openlab_search_not_available_at_the_moment: "La recherche sur tout le réseau n'est pas disponible pour le moment. Vous pouvez cependant effectuer une recherche parmis les projets de cette plateforme."
         project_search_result_is_empty: "Il n'y a pas de projets correspondant à vos critères de recherche."
diff --git a/doc/virtual-machine.md b/doc/virtual-machine.md
index 4173ab790..9bbf1b63d 100644
--- a/doc/virtual-machine.md
+++ b/doc/virtual-machine.md
@@ -1,6 +1,6 @@
 # Virtual Machine Instructions
 
-These instructions allow to deploy a testing or development instance of Fab Manager inside a virtual
+These instructions allow to deploy a testing or development instance of Fab-manager inside a virtual
 machine, with most of the software dependencies installed automatically and avoiding to install a lot
 of software and services directly on the host computer.
 
@@ -68,4 +68,4 @@ the host can provide but will usually be much more slower than a production envi
 
 ---
 [vagrant]: https://www.vagrantup.com/downloads.html
-[virtualbox]: https://www.virtualbox.org/wiki/Downloads
\ No newline at end of file
+[virtualbox]: https://www.virtualbox.org/wiki/Downloads
diff --git a/setup/env.example b/setup/env.example
index 47c3b74d6..d464e80da 100644
--- a/setup/env.example
+++ b/setup/env.example
@@ -19,7 +19,7 @@ EVENTS_IN_CALENDAR=false
 SLOT_DURATION=60
 FEATURE_TOUR_DISPLAY=once
 
-DEFAULT_MAIL_FROM=Fab Manager Demo <noreply@fab-manager.com>
+DEFAULT_MAIL_FROM=Fab-manager Demo <noreply@fab-manager.com>
 DEFAULT_HOST=demo.fab-manager.com
 DEFAULT_PROTOCOL=http