diff --git a/ietf/group/migrations/0052_populate_groupfeatures_session_purposes.py b/ietf/group/migrations/0052_populate_groupfeatures_session_purposes.py
index 5e2353ed7..ba7a93ea4 100644
--- a/ietf/group/migrations/0052_populate_groupfeatures_session_purposes.py
+++ b/ietf/group/migrations/0052_populate_groupfeatures_session_purposes.py
@@ -6,12 +6,21 @@ from django.db import migrations
 
 
 default_purposes = dict(
-    dir=['presentation', 'social', 'tutorial'],
-    ietf=['admin', 'presentation', 'social'],
-    nomcom=['closed', 'officehours'],
-    rg=['session'],
+    adhoc=['presentation'],
+    adm=['closed_meeting', 'officehours'],
+    ag=['regular'],
+    area=['regular'],
+    dir=['presentation', 'social', 'tutorial', 'regular'],
+    iab=['closed_meeting', 'regular'],
+    iabasg=['open_meeting', 'closed_meeting'],
+    ietf=['admin', 'plenary', 'presentation', 'social'],
+    nomcom=['closed_meeting', 'officehours'],
+    program=['regular', 'tutorial'],
+    rag=['regular'],
+    review=['open_meeting', 'social'],
+    rg=['regular'],
     team=['coding', 'presentation', 'social', 'tutorial'],
-    wg=['session'],
+    wg=['regular'],
 )
 
 
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index b2fb786a0..396c26e34 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -597,7 +597,7 @@ def edit_meeting_schedule(request, num=None, owner=None, name=None):
 
             s.scheduling_label = "???"
             s.purpose_label = None
-            if (s.purpose is None or s.purpose.slug == 'session') and s.group:
+            if (s.purpose is None or s.purpose.slug == 'regular') and s.group:
                 s.scheduling_label = s.group.acronym
                 s.purpose_label = 'BoF' if s.group.is_bof() else s.group.type.name
             else:
diff --git a/ietf/name/migrations/0036_populate_sessionpurposename.py b/ietf/name/migrations/0036_populate_sessionpurposename.py
index b36036059..a8304b86d 100644
--- a/ietf/name/migrations/0036_populate_sessionpurposename.py
+++ b/ietf/name/migrations/0036_populate_sessionpurposename.py
@@ -10,14 +10,16 @@ def forward(apps, schema_editor):
     TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
 
     for order, (slug, name, desc, tstypes) in enumerate((
-            ('session', 'Session', 'Group session', ['regular']),
+            ('regular', 'Regular', 'Regular group session', ['regular']),
             ('tutorial', 'Tutorial', 'Tutorial or training session', ['other']),
             ('officehours', 'Office hours', 'Office hours session', ['other']),
             ('coding', 'Coding', 'Coding session', ['other']),
             ('admin', 'Administrative', 'Meeting administration', ['other', 'reg']),
-            ('social', 'Social', 'Social event or activity', ['other']),
+            ('social', 'Social', 'Social event or activity', ['break', 'other']),
+            ('plenary', 'Plenary', 'Plenary session', ['plenary']),
             ('presentation', 'Presentation', 'Presentation session', ['other', 'regular']),
-            ('closed', 'Closed meeting', 'Closed meeting', ['other',]),
+            ('open_meeting', 'Open meeting', 'Open meeting', ['other']),
+            ('closed_meeting', 'Closed meeting', 'Closed meeting', ['other', 'regular']),
     )):
         # verify that we're not about to use an invalid purpose
         for ts_type in tstypes:
diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html
index 3f85986fb..0f5bfca8f 100644
--- a/ietf/secr/templates/includes/sessions_request_view.html
+++ b/ietf/secr/templates/includes/sessions_request_view.html
@@ -9,7 +9,7 @@
           <dl>
             <dt>Length</dt><dd>{{ sess_form.cleaned_data.requested_duration.total_seconds|display_duration }}</dd>
             {% if sess_form.cleaned_data.name %}<dt>Name</dt><dd>{{ sess_form.cleaned_data.name }}</dd>{% endif %}
-            {% if sess_form.cleaned_data.purpose.slug != 'session' %}
+            {% if sess_form.cleaned_data.purpose.slug != 'regular' %}
               <dt>Purpose</dt>
               <dd>
                 {{ sess_form.cleaned_data.purpose }}
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index 584836aa9..ab5dd8ed2 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -195,12 +195,6 @@
             {% endfor %}
           </span>
 
-          <span class="timeslot-type-toggles">
-            {% for purpose in session_purposes %}
-              <label class="purpose-{{ purpose.slug }}"><input type="checkbox" checked value="{{ purpose.slug }}"> {{ purpose }}</label>
-            {% endfor %}
-          </span>
-
           <span class="timeslot-group-toggles">
             <button class="btn btn-default" data-toggle="modal" data-target="#timeslot-group-toggles-modal"><input type="checkbox" checked="checked" disabled> Timeslots</button>
           </span>
diff --git a/ietf/templates/meeting/edit_meeting_schedule_session.html b/ietf/templates/meeting/edit_meeting_schedule_session.html
index 29cdd18df..472138e26 100644
--- a/ietf/templates/meeting/edit_meeting_schedule_session.html
+++ b/ietf/templates/meeting/edit_meeting_schedule_session.html
@@ -1,5 +1,5 @@
 <div id="session{{ session.pk }}"
-     class="session {% if not session.group.parent.scheduling_color %}untoggleable-by-parent{% endif %} {% if session.parent_acronym %}parent-{{ session.parent_acronym }} {% endif %}{% if session.purpose %}purpose-{{ session.purpose.slug }} {% else %} purpose-session {% endif %}{% if session.readonly %}readonly {% endif %}"
+     class="session {% if not session.group.parent.scheduling_color %}untoggleable-by-parent{% endif %} {% if session.parent_acronym %}parent-{{ session.parent_acronym }}{% endif %} purpose-{% firstof session.purpose.slug 'regular' %} {% if session.readonly %}readonly{% endif %}"
      style="width:{{ session.layout_width }}em;"
      data-duration="{{ session.requested_duration.total_seconds }}" {% if session.attendees != None %}
      data-attendees="{{ session.attendees }}"{% endif %}