diff --git a/calendar.md b/calendar.md
index aa661807d..fd79a722a 100644
--- a/calendar.md
+++ b/calendar.md
@@ -8,7 +8,7 @@ The HSF [Community Calendar](https://calendar.google.com/calendar/embed?src=e4v3
 can be edited by people in the following Google Groups:
 
 - [HSF Steering Group](https://groups.google.com/forum/#!forum/hsf-steering)
-- [HSF Working Group Conveners](https://groups.google.com/forum/#!forum/hsf-wg-conveners)
+- [HSF Activity Area Conveners](https://groups.google.com/forum/#!forum/hsf-wg-conveners)
 - [HSF Calendar Editors Group](https://groups.google.com/forum/#!forum/hsf-calendar-editors) Google Groups.
 
 The most straight forward way to do this is to 
@@ -25,4 +25,4 @@ Then you will have the ability to view events in the community calendar and, if
 
 Please ask to join one of the editing groups if you would like to add events
 for your experiment or community.
-Events in HSF working groups indico categories should be synced automatically.
+Events in HSF Activity Area Indico categories should be synced automatically.
diff --git a/forums.md b/forums.md
index 086cef0a0..2a71bef58 100644
--- a/forums.md
+++ b/forums.md
@@ -30,20 +30,12 @@ The [hsf-tech-forum](https://groups.google.com/forum/#%21forum/hsf-tech-forum) i
 This is not strictly an HSF mailing list. The [HEP S&C community mailing list](http://groups.google.com/d/forum/hep-sw-comp) is intended for occasional HEP software and computing community mailings. Everyone involved or interested in HEP S&C is encouraged to sign up to this list. It will be used for occasional mailings of community wide interest, such as announcements of HEP S&C conferences, workshops and schools not strictly related to the HSF.
 
 
-## Dedicated Activities and Working Groups
+## Dedicated Activity Areas
 -----
 
-Each of the HSF Working groups maintains a dedicated page where contact
+Each of the HSF Activity Areas maintains a dedicated page where contact
 information for that group can be found:
 
-<ul class="list">
-{% for wg in site.workinggroups %}
-  <li> <a href="{{ wg.url }}">{{ wg.title }}</a></li>
-{% endfor %}
-</ul>
-
-And for other HSF activities there are also dedicated pages:
-
 <ul class="list">
 {% for activity in site.activities %}
   <li> <a href="{{ activity.url }}">{{ activity.title }}</a></li>
diff --git a/get_involved.md b/get_involved.md
index cc6203686..3322c15e9 100644
--- a/get_involved.md
+++ b/get_involved.md
@@ -19,10 +19,10 @@ other existing discussion forums.
 ## Areas for contribution
 
 There are plenty of opportunities for you to contribute to the HSF, be it by
-participation in technical discussions, by joining one of our working groups, or
+participation in technical discussions, by joining one of our Activity Areas, or
 by joining the HSF with your software project:
 
-  *  Participation in HSF [working groups]({{ site.baseurl }}/what_are_WGs.html) and [activity areas]({{ site.baseurl }}/what_are_activities.html)
+  *  Participation in HSF [Activity Areas]({{ site.baseurl }}/what_are_activities.html)
   *  Participation in [HSF events and meetings]({{ site.baseurl }}/future-events.html)
   *  Taking advantage of the HSF by identifying your [software project]({{ site.baseurl }}/projects.html) with us
   *  Giving input to the [HSF Steering Group]({{ site.baseurl }}/organization/team.html)
diff --git a/howto-profile.md b/howto-profile.md
index 9653f0f6c..ce111363b 100644
--- a/howto-profile.md
+++ b/howto-profile.md
@@ -33,7 +33,7 @@ Either
 * If you have specified your [gravatar](https://gravatar.com/) (a free service for global avatar synchornization), we will take your profile picture from there. Else, the profile picture will be taken from your [github](https://github.com) profile (if specified). If the latter is not specified either, you will have a blank profile picture showing an [octocat](https://en.wikipedia.org/wiki/GitHub#Mascot).
 * If you don't know your gravatar email hash, you can [use this page](https://en.gravatar.com/site/check/) (or look [here](https://en.gravatar.com/site/implement/hash/) for more background information about the hashing)
 
-### Working group specific settings
+### Activity Area specific settings
 
 * To be listed as "educator" on the [training community page]({{ site.baseurl }}/training/community.html) or the [educators page]({{ site.baseurl }}/training/educators.html):
   * Set the `training_roles` field: Zero or more of `instructor`, `mentor`, `facilitator`, `author`. The first three ``training_roles`` are explained [here]({{ site.baseurl }}/training/educators.html). You are an `author` if you've made not-completely-trivial contributions to our training material. Valid examples: ``[]``, ``[instructor, mentor]``.  **Invalid**: ``mentor`` (no brackets).
diff --git a/howto-website.md b/howto-website.md
index 3b52efe1b..25bd381d5 100644
--- a/howto-website.md
+++ b/howto-website.md
@@ -61,14 +61,14 @@ HSF Coordination minutes are produced using the live notes approach described ab
 
 The only edit required is the replacement of the *front-matter* section by the one present in the previous meeting minutes in Jekyll, updating the title (meeting number and date).
 
-### Adding a working group or activity
+### Adding an Activity Area
 
-*Before adding any new activity or proposing a new working group please discuss with the
-[HSF Coordination Team]({{ site.baseurl }}/organization/team.html)! We will make sure it gets proposed
-in an HSF meeting for approval.*
+*Before adding any new activity or proposing a new Activity Area please discuss with the
+[HSF Steering Group]({{ site.baseurl }}/organization/team.html)!
+We will make sure it gets proposed in an HSF meeting for approval.*
 
-Then, for the technical creation, add a new file in the `_workinggroups` or `_activities` directory. Follow the front-matter of the
-other files in there. The `Working Groups` / `Activities` menu in the navigation bar will
+Then, for the technical creation, add a new file in the `_activities` directory. Follow the front-matter of the
+other files in there. The `Activities` menu in the navigation bar will
 be updated automatically: the menu entry text is the `title` attribute in the *front-matter* section.
 
 ### Adding an event
@@ -79,7 +79,7 @@ in there. The [Events](http://hepsoftwarefoundation.org/events.html) page and th
 ### Adding a training event
 
 For *training events* we have a special handling that lists all of these together on the 
-[Training Working Group page]({{ site.baseurl }}/workinggroups/training.html). To create a new
+[Training Activity Area page]({{ site.baseurl }}/workinggroups/training.html). To create a new
 entry you can either:
 
 1. Run the interactive script ``scripts/add_training_event.py`` (recommended)
@@ -128,7 +128,7 @@ As of writing, this website contains the following page templates for wider usag
 ### Menu bar and automatization
 
 The menu bar is defined in `_includes/navbar.ext`, from which all page layouts inherit.
-The layout is somewhat hard-coded, but working groups and activities are generated
+The layout is somewhat hard-coded, but activities are generated
 automatically.
 
 ### Main page
diff --git a/projects/affiliated.md b/projects/affiliated.md
index 3980b1ac7..e93f3583b 100644
--- a/projects/affiliated.md
+++ b/projects/affiliated.md
@@ -23,7 +23,7 @@ Anyone is welcome to engage with the HSF in general and the
 [HSF Steering Group (SG)]({{ site.baseurl }}/organization/team.html),
 in particular to discuss the route towards making a software project or package an HSF Affiliated Project or Software. This can be an informal discussion initially.
 
-Formal endorsement is provided by the HSF SG following a short evaluation period in consultation with the relevant HSF Working Group conveners and community experts. For transparency, these evaluations (start, scope and end) are advertised publicly via the HSF Forum, the HSF's main means of communication.
+Formal endorsement is provided by the HSF SG following a short evaluation period in consultation with the relevant HSF Activity Area conveners and community experts. For transparency, these evaluations (start, scope and end) are advertised publicly via the HSF Forum, the HSF's main means of communication.
 
 The list of HSF Affiliated Projects and Software is hosted in a dedicated area on the HSF website, curated and maintained by the HSF SG.
 
@@ -47,7 +47,7 @@ They are detailed in the document
 
 The HSF can organise informal reviews of community projects upon request. Such reviews bring together a group of experts from the community to assess all aspects of a project or software, from requirements to implementation: code, packaging, documentation, etc.
 
-The reviews are organised by the HSF SG in consultation with relevant Working Group conveners. For transparency, these reviews (start, scope and end) are advertised publicly via the HSF Forum, the HSF's main means of communication, and the results are made public.
+The reviews are organised by the HSF SG in consultation with relevant Activity Area conveners. For transparency, these reviews (start, scope and end) are advertised publicly via the HSF Forum, the HSF's main means of communication, and the results are made public.
 
 ## HSF Requirements and Reference Implementation