diff --git a/_includes/footer_orekit.html b/_includes/footer_orekit.html
index 81c5eb7bdfc9889b08e6ccbec9f33669ce500976..a14229a8e0cc0fdab3a01205ecc0483979e9e0ab 100644
--- a/_includes/footer_orekit.html
+++ b/_includes/footer_orekit.html
@@ -11,7 +11,7 @@
 
           <div class="col-sm-6 col-md-6 col-lg-8 col-xl-6">
             <div id="footerCopyright">
-              <p>Copyright &copy; 2002-2019 <a href="http://www.c-s.fr/">CS Group</a> and
+              <p>Copyright &copy; 2002-2019 <a href="http://www.c-s.fr/">CS GROUP</a> and
                 <a href="https://gitlab.orekit.org/orekit/orekit/graphs/master">others</a><br/>
                 <a rel="license" href="http://creativecommons.org/licenses/by/3.0/"><img alt="CC By 3.0 logo" src="/img/cc-by-3.0-80x15.png"/></a>
                 Except where otherwise noted, the Orekit web pages are released under
@@ -21,7 +21,7 @@
           </div>
 
           <div class="col-sm-6 col-md-3 col-lg-2 col-xl-3">
-            <p class="sponsor">Orekit is sponsored by<br/><a href="http://www.c-s.fr/">CS Group</a></p>
+            <p class="sponsor">Orekit is sponsored by<br/><a href="http://www.c-s.fr/">CS GROUP</a></p>
           </div>
 
         </div>
diff --git a/_includes/footer_rugged.html b/_includes/footer_rugged.html
index ed26da15b0055fdedea98c548c5a311be180d51a..50d1b1cbd02bb8596302f34b632ae4196c8a1946 100644
--- a/_includes/footer_rugged.html
+++ b/_includes/footer_rugged.html
@@ -11,7 +11,7 @@
 
           <div class="col-sm-6 col-md-6 col-lg-8 col-xl-6">
             <div id="footerCopyright">
-              <p>Copyright &copy; 2014-2019 <a href="http://www.c-s.fr/">CS Group</a> and
+              <p>Copyright &copy; 2014-2019 <a href="http://www.c-s.fr/">CS GROUP</a> and
                 <a href="https://gitlab.orekit.org/orekit/rugged/graphs/master">others</a><br/>
                 <a rel="license" href="http://creativecommons.org/licenses/by/3.0/"><img alt="CC By 3.0 logo" src="/img/cc-by-3.0-80x15.png"/></a>
                 Except where otherwise noted, the Rugged web pages are released under
@@ -21,7 +21,7 @@
           </div>
 
           <div class="col-sm-6 col-md-3 col-lg-2 col-xl-3">
-            <p class="sponsor">Rugged is sponsored by<br/><a href="http://www.c-s.fr/">CS Group</a></p>
+            <p class="sponsor">Rugged is sponsored by<br/><a href="http://www.c-s.fr/">CS GROUP</a></p>
           </div>
 
         </div>
diff --git a/_includes/footer_stavor.html b/_includes/footer_stavor.html
index 0309d4a2aae6c12ef0dfd308bf78230f4dfd22b1..28ffa90e81ed19b2e3596d45f92f454dded9569a 100644
--- a/_includes/footer_stavor.html
+++ b/_includes/footer_stavor.html
@@ -11,7 +11,7 @@
 
           <div class="col-sm-6 col-md-6 col-lg-8 col-xl-6">
             <div id="footerCopyright">
-              <p>Copyright &copy; 2014-2019 <a href="http://www.c-s.fr/">CS Group</a> and
+              <p>Copyright &copy; 2014-2019 <a href="http://www.c-s.fr/">CS GROUP</a> and
                 <a href="https://gitlab.orekit.org/orekit/stavor/graphs/master">others</a><br/>
                 <a rel="license" href="http://creativecommons.org/licenses/by/3.0/"><img alt="CC By 3.0 logo" src="/img/cc-by-3.0-80x15.png"/></a>
                 Except where otherwise noted, the Stavor web pages are released under
@@ -21,7 +21,7 @@
           </div>
 
           <div class="col-sm-6 col-md-3 col-lg-2 col-xl-3">
-            <p class="sponsor">Stavor is sponsored by<br/><a href="http://www.c-s.fr/">CS Group</a></p>
+            <p class="sponsor">Stavor is sponsored by<br/><a href="http://www.c-s.fr/">CS GROUP</a></p>
           </div>
 
         </div>
diff --git a/_posts/2018-01-24-open-governance-for-rugged.md b/_posts/2018-01-24-open-governance-for-rugged.md
index 6a58eaab5076a8f081952d4971ae6d46fee08a43..20b41d334d4ac5fd6a1c2fdfaceb93ea2d2d210e 100644
--- a/_posts/2018-01-24-open-governance-for-rugged.md
+++ b/_posts/2018-01-24-open-governance-for-rugged.md
@@ -25,9 +25,9 @@ The initial PMC members are:
   * Aude Espesset (TAS)
   * Ferran Gascon (ESA)
   * Daniel Greslou (CNES)
-  * Jonathan Guinet (CS Group)
-  * Sébastien Harasse (CS Group)
+  * Jonathan Guinet (CS GROUP)
+  * Sébastien Harasse (CS GROUP)
   * Mathieu Jung (ADS)
-  * Luc Maisonobe (CS Group)
+  * Luc Maisonobe (CS GROUP)
 
 The PMC chair is Sébastien HARASSE.
diff --git a/_posts/2019-01-04-yannick-is-now-pmc-member.md b/_posts/2019-01-04-yannick-is-now-pmc-member.md
index e54f756db2054168964d7e5e8d8f1158e0f38e34..5fa4dc105c77e29f39e76b4ef4604f839e6c9896 100644
--- a/_posts/2019-01-04-yannick-is-now-pmc-member.md
+++ b/_posts/2019-01-04-yannick-is-now-pmc-member.md
@@ -23,13 +23,13 @@ The current PMC members are:
 
   * Paul Cefola (University at Buffalo)
   * Frank Dreger (European Space Agency - ESOC)
-  * Nicolas Frouvelle (CS Group)
+  * Nicolas Frouvelle (CS GROUP)
   * Hank Grabowski (Independent Expert)
   * Sébastien Herbinière (Thales Alenia Space)
   * Petrus Hyvönen (Swedish Space Corporation)
   * Yannick Jeandroz (Airbus Defense and Space)
   * Stéphanie Lizy-Destrez (ISAE - Sup'Aéro)
-  * Luc Maisonobe (CS Group)
+  * Luc Maisonobe (CS GROUP)
   * Guillermo Ortega (European Space Agency - ESTEC)
-  * Pascal Parraud (CS Group)
+  * Pascal Parraud (CS GROUP)
   * Evan Ward (Naval Research Laboratory)
diff --git a/_posts/2019-03-05-sebastien-is-now-pmc-member.md b/_posts/2019-03-05-sebastien-is-now-pmc-member.md
index 42990b256f1283e5a615d4ac1a0a660bec83c4d6..e46f60b931050a749610f3c49bf9796f480b95bc 100644
--- a/_posts/2019-03-05-sebastien-is-now-pmc-member.md
+++ b/_posts/2019-03-05-sebastien-is-now-pmc-member.md
@@ -21,9 +21,9 @@ PMC rights to Sébastien Dorgan. Welcome to him!
 The current PMC members are:
 
   * Aude Espesset (Thales Alenia Space)
-  * Sébastien Dorgan (CS Group)
+  * Sébastien Dorgan (CS GROUP)
   * Ferran Gascon (European Space Agency)
   * Daniel Greslou (Centre National d'Études Spatiales)
-  * Jonathan Guinet (CS Group)
+  * Jonathan Guinet (CS GROUP)
   * Mathieu Jung (Airbus Defense and Space)
-  * Luc Maisonobe (CS Group)
+  * Luc Maisonobe (CS GROUP)
diff --git a/_posts/2019-12-11-orekit-at-ieee-ion-plans-2020.md b/_posts/2019-12-11-orekit-at-ieee-ion-plans-2020.md
index e44c503d7ce1b3bbbc1051d27f1a41fba292ca5f..37ec11d43cfdd40f899cb3cb281105823d535390 100644
--- a/_posts/2019-12-11-orekit-at-ieee-ion-plans-2020.md
+++ b/_posts/2019-12-11-orekit-at-ieee-ion-plans-2020.md
@@ -19,6 +19,6 @@ conference in Portland, Oregon from April 20th to April 23th 2020.
 
 There will be one conference paper related to Orekit: _Improve GNSS Orbit
 Determination by using Estimated Tropospheric and Ionospheric Model_ by Bryan
-Cazabonne (CS Group) et al. in the Space Navigation and Observation session.
+Cazabonne (CS GROUP) et al. in the Space Navigation and Observation session.
 
 We would be pleased to meet Orekit users at the conference.
diff --git a/_posts/2020-04-17-Interview-of-Luc-for-Cold-Star-Project.md b/_posts/2020-04-17-Interview-of-Luc-for-Cold-Star-Project.md
index e6a0716c0836a853dfa020902395d59a9a6a1632..c53d8bbcfbbef24813d56bd828a9c0d2f9552f5a 100644
--- a/_posts/2020-04-17-Interview-of-Luc-for-Cold-Star-Project.md
+++ b/_posts/2020-04-17-Interview-of-Luc-for-Cold-Star-Project.md
@@ -13,7 +13,7 @@ tags:
 - team
 ---
 
-Recently, Luc Maisonobe (CS Group) was interviewed by Jason Kanigan to talk about the Orekit project.
+Recently, Luc Maisonobe (CS GROUP) was interviewed by Jason Kanigan to talk about the Orekit project.
 The interview addresses subjects such as:
 
 * How the idea of Orekit was conceived.
diff --git a/atom.xml b/atom.xml
index e540bc17ad8e77b411b6e7908296c3697441fbcd..7a206662ee6f50c452b5cc58cf44325aa591100c 100644
--- a/atom.xml
+++ b/atom.xml
@@ -11,7 +11,7 @@ title: Orekit Atom feed
   <updated>{{ site.time | date_to_xmlschema }}</updated>
   <id>{{ site.url }}/</id>
   <author>
-    <name>CS Group</name>
+    <name>CS GROUP</name>
     <email>{{ site.email }}</email>
   </author>
 
diff --git a/index.html b/index.html
index 71a07a53081c0986b23f2a88d50ce89f24a53ee1..1c292dc2e85d8eaadc8ff4ce05461b0de6e65ba5 100644
--- a/index.html
+++ b/index.html
@@ -55,7 +55,7 @@ layout: home_orekit
     <ul class="fa-ul">
 
       <li><span class="fa-li fa-lg fa fa-gears"></span>
-        <p><a href="https://uk.c-s.fr/">CS Group</a> develops
+        <p><a href="https://uk.c-s.fr/">CS GROUP</a> develops
           <a href="https://oraas.orekit.space">ORaaS</a> (Orekit-as-a-Service),
           an Orekit-based web service including demos, tools and a REST API to
           access services such as orbit determination.</p>
@@ -125,7 +125,7 @@ layout: home_orekit
     <h2><span class="fa fa-wrench"></span> Development</h2>
 
     <p>Orekit has been in development since 2002 inside
-      <a href="http://www.c-s.fr/">CS Group</a> and is still used and
+      <a href="http://www.c-s.fr/">CS GROUP</a> and is still used and
       maintained by its space dynamics experts. Several major actors of space
       research and industry are now involved into this project.</p>
 
@@ -160,15 +160,15 @@ layout: home_orekit
     <ul>
       <li>Paul Cefola (University at Buffalo)</li>
       <li>Frank Dreger (European Space Agency)</li>
-      <li>Nicolas Frouvelle (CS Group)</li>
+      <li>Nicolas Frouvelle (CS GROUP)</li>
       <li>Hank Grabowski (Independent Expert)</li>
       <li>Sébastien Herbinière (Thales Alenia Space)</li>
       <li>Petrus Hyvönen (Swedish Space Corporation)</li>
       <li>Yannick Jeandroz (Airbus Defense and Space)</li>
       <li>Stéphanie Lizy-Destrez (ISAE)</li>
-      <li>Luc Maisonobe (CS Group)</li>
+      <li>Luc Maisonobe (CS GROUP)</li>
       <li>Guillermo Ortega (European Space Agency)</li>
-      <li>Pascal Parraud (CS Group)</li>
+      <li>Pascal Parraud (CS GROUP)</li>
       <li>Evan Ward (U.S. Naval Research Laboratory)</li>
     </ul>
 
diff --git a/rugged/atom.xml b/rugged/atom.xml
index 90bc94ae209f686364e405ec9a6cb84490e8a29f..6fb0378e4191d92f28b7c43a51b55acfb5667193 100644
--- a/rugged/atom.xml
+++ b/rugged/atom.xml
@@ -11,7 +11,7 @@ title: Rugged Atom feed
   <updated>{{ site.time | date_to_xmlschema }}</updated>
   <id>{{ site.url }}/</id>
   <author>
-    <name>CS Group</name>
+    <name>CS GROUP</name>
     <email>{{ site.email }}</email>
   </author>
 
diff --git a/rugged/index.html b/rugged/index.html
index a5b03e1c975353f66427c6fe4b6e86bc120408e6..57e84996dac77b5a555f98ea870fadd6ac434629 100644
--- a/rugged/index.html
+++ b/rugged/index.html
@@ -67,7 +67,7 @@ layout: home_rugged
       </li>
 
       <li><span class="fa-li fa-lg fa fa-gears"></span>
-        <p>Rugged is used for study purposes inside <a href="http://www.c-s.fr/">CS Group</a>.</p>
+        <p>Rugged is used for study purposes inside <a href="http://www.c-s.fr/">CS GROUP</a>.</p>
       </li>
 
     </ul>
@@ -92,7 +92,7 @@ layout: home_rugged
     <h2><span class="fa fa-wrench"></span> Development</h2>
 
     <p>Rugged has been in development since 2014 inside
-    <a href="http://www.c-s.fr/">CS Group</a> and is still
+    <a href="http://www.c-s.fr/">CS GROUP</a> and is still
     used and maintained by its dual teams of space dynamics and image
     processing experts.</p>
 
diff --git a/rugged/overview.html b/rugged/overview.html
index c7d2e6ebd6b8d144c175719085106d6ff2f3891a..5ab302ea1350b54db14a1021fe42da781191b779 100644
--- a/rugged/overview.html
+++ b/rugged/overview.html
@@ -27,7 +27,7 @@ version 1.4 (or above) libraries at runtime.</p>
 <ul>
   <li>
     <p><strong>Orekit 9.3.1</strong><br/>
-    Copyright &copy; <a href="http://www.c-s.fr/">CS Group</a><br/>
+    Copyright &copy; <a href="http://www.c-s.fr/">CS GROUP</a><br/>
     License: <a href="../license.html">Apache License, version 2.0</a><br/>
     Reference: <a href="..">Orekit</a></p>
   </li>
diff --git a/rugged/support.html b/rugged/support.html
index d9910d1305b2ee353745d0886e7a3027e7385052..13914e7a4cc2bfd9e431838b8c08e797520a49bd 100644
--- a/rugged/support.html
+++ b/rugged/support.html
@@ -58,13 +58,13 @@ layout: default_rugged
     <p>Commercial support and training for users of Rugged are provided by CS
       Group. Their space dynamics and image processing experts are also
       available for studies and custom development. Please
-      <a href="mailto:rugged@c-s.fr">contact CS Group</a> for more
+      <a href="mailto:rugged@c-s.fr">contact CS GROUP</a> for more
       information.</p>
 
     <div class="bs-callout bs-callout-warning">
-      <strong>CS Group</strong><br/>
+      <strong>CS GROUP</strong><br/>
       Space Business Unit<br/>
-      Parc de la Plaine - 5 rue Brindejonc des Moulinais<br/>
+      Parc de la Plaine - 6 rue Brindejonc des Moulinais<br/>
       BP 15872<br/>
       31506 Toulouse Cedex 5<br/>
       France<br/>
diff --git a/stavor/atom.xml b/stavor/atom.xml
index 0f951939c69fa50a601b00c8a8c077042bb5e9ba..86bdbaa9280150ba4a89700572047261981d781f 100644
--- a/stavor/atom.xml
+++ b/stavor/atom.xml
@@ -11,7 +11,7 @@ title: Stavor Atom feed
   <updated>{{ site.time | date_to_xmlschema }}</updated>
   <id>{{ site.url }}/</id>
   <author>
-    <name>CS Group</name>
+    <name>CS GROUP</name>
     <email>{{ site.email }}</email>
   </author>
 
diff --git a/stavor/index.html b/stavor/index.html
index ad9f02a29738af37a13a369c5f3858b50ae12f80..b1a142aef0001b7587efb607c003454c2c7c754f 100644
--- a/stavor/index.html
+++ b/stavor/index.html
@@ -41,7 +41,7 @@ layout: home_stavor
     <h2><span class="fa fa-wrench"></span> Development</h2>
 
     <p>Stavor has been in development since 2014 inside
-      <a href="http://www.c-s.fr/">CS Group</a>
+      <a href="http://www.c-s.fr/">CS GROUP</a>
       and is still used and maintained by its dual teams of space dynamics and
       mobile applications experts.</p>
 
diff --git a/stavor/support.html b/stavor/support.html
index a7fe9d51c4acc25c01dfb829fc23445d517fff30..63bec2b25a366b0dc15e66c5d77f1077a815fa09 100644
--- a/stavor/support.html
+++ b/stavor/support.html
@@ -29,13 +29,13 @@ layout: default_stavor
     <p>Commercial support and training for users of Stavor are provided by CS
       Group. Their space dynamics and mobile applications experts are also
       available for studies and custom development. Please
-      <a href="mailto:orekit@c-s.fr">contact CS Group</a> for more
+      <a href="mailto:orekit@c-s.fr">contact CS GROUP</a> for more
       information.</p>
 
     <div class="bs-callout bs-callout-warning">
-      <strong>CS Group</strong><br/>
+      <strong>CS GROUP</strong><br/>
       Space Business Unit<br/>
-      Parc de la Plaine - 5 rue Brindejonc des Moulinais<br/>
+      Parc de la Plaine - 6 rue Brindejonc des Moulinais<br/>
       BP 15872<br/>
       31506 Toulouse Cedex 5<br/>
       France<br/>
diff --git a/support.html b/support.html
index 167e3452141e5cd18843c0ac1fc20bdb21d17e1d..cdd3f708b5b906084b1fb6608601415911891491 100644
--- a/support.html
+++ b/support.html
@@ -56,13 +56,13 @@ layout: default_orekit
 
     <p>Commercial support and training for users of Orekit are provided by CS
       Group. Their space dynamics experts are also available for studies and
-      custom development. Please <a href="mailto:orekit@c-s.fr">contact CS Group</a>
+      custom development. Please <a href="mailto:orekit@c-s.fr">contact CS GROUP</a>
       for more information.</p>
 
     <div class="bs-callout bs-callout-warning">
-      <strong>CS Group</strong><br/>
+      <strong>CS GROUP</strong><br/>
       Space Business Unit<br/>
-      Parc de la Plaine - 5 rue Brindejonc des Moulinais<br/>
+      Parc de la Plaine - 6 rue Brindejonc des Moulinais<br/>
       BP 15872<br/>
       31506 Toulouse Cedex 5<br/>
       France<br/>