diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index 730545b32..255631d25 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -21,17 +21,6 @@
  "model": "name.ballotpositionname",
  "pk": "noobj"
 },
-{
- "fields": {
-  "order": 3,
-  "used": true,
-  "name": "Discuss",
-  "blocking": true,
-  "desc": ""
- },
- "model": "name.ballotpositionname",
- "pk": "discuss"
-},
 {
  "fields": {
   "order": 3,
@@ -43,6 +32,17 @@
  "model": "name.ballotpositionname",
  "pk": "block"
 },
+{
+ "fields": {
+  "order": 3,
+  "used": true,
+  "name": "Discuss",
+  "blocking": true,
+  "desc": ""
+ },
+ "model": "name.ballotpositionname",
+ "pk": "discuss"
+},
 {
  "fields": {
   "order": 4,
@@ -124,11 +124,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "reStructuredText",
+  "name": "Django",
   "desc": ""
  },
  "model": "name.dbtemplatetypename",
- "pk": "rst"
+ "pk": "django"
 },
 {
  "fields": {
@@ -144,44 +144,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Django",
+  "name": "reStructuredText",
   "desc": ""
  },
  "model": "name.dbtemplatetypename",
- "pk": "django"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Obsoleted by",
-  "used": true,
-  "name": "Obsoletes",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "obs"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Updated by",
-  "used": true,
-  "name": "Updates",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "updates"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Replaced by",
-  "used": true,
-  "name": "Replaces",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "replaces"
+ "pk": "rst"
 },
 {
  "fields": {
@@ -194,28 +161,6 @@
  "model": "name.docrelationshipname",
  "pk": "conflrev"
 },
-{
- "fields": {
-  "order": 0,
-  "revname": "is normatively referenced by",
-  "used": true,
-  "name": "normatively references",
-  "desc": "Normative Reference"
- },
- "model": "name.docrelationshipname",
- "pk": "refnorm"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Referenced by",
-  "used": true,
-  "name": "Reference",
-  "desc": "A reference found in a document which does not have split normative/informative reference sections."
- },
- "model": "name.docrelationshipname",
- "pk": "refold"
-},
 {
  "fields": {
   "order": 0,
@@ -227,50 +172,6 @@
  "model": "name.docrelationshipname",
  "pk": "refinfo"
 },
-{
- "fields": {
-  "order": 0,
-  "revname": "Moved to Proposed Standard by",
-  "used": true,
-  "name": "Moves to Proposed Standard",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "tops"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Moved to Internet Standard by",
-  "used": true,
-  "name": "Moves to Internet Standard",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "tois"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Moved to Historic by",
-  "used": true,
-  "name": "Moves to Historic",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "tohist"
-},
-{
- "fields": {
-  "order": 0,
-  "revname": "Moved to Informational by",
-  "used": true,
-  "name": "Moves to Informational",
-  "desc": ""
- },
- "model": "name.docrelationshipname",
- "pk": "toinf"
-},
 {
  "fields": {
   "order": 0,
@@ -293,6 +194,72 @@
  "model": "name.docrelationshipname",
  "pk": "toexp"
 },
+{
+ "fields": {
+  "order": 0,
+  "revname": "Moved to Historic by",
+  "used": true,
+  "name": "Moves to Historic",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "tohist"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "Moved to Informational by",
+  "used": true,
+  "name": "Moves to Informational",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "toinf"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "Moved to Internet Standard by",
+  "used": true,
+  "name": "Moves to Internet Standard",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "tois"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "Moved to Proposed Standard by",
+  "used": true,
+  "name": "Moves to Proposed Standard",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "tops"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "is normatively referenced by",
+  "used": true,
+  "name": "normatively references",
+  "desc": "Normative Reference"
+ },
+ "model": "name.docrelationshipname",
+ "pk": "refnorm"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "Obsoleted by",
+  "used": true,
+  "name": "Obsoletes",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "obs"
+},
 {
  "fields": {
   "order": 0,
@@ -304,6 +271,39 @@
  "model": "name.docrelationshipname",
  "pk": "possibly-replaces"
 },
+{
+ "fields": {
+  "order": 0,
+  "revname": "Referenced by",
+  "used": true,
+  "name": "Reference",
+  "desc": "A reference found in a document which does not have split normative/informative reference sections."
+ },
+ "model": "name.docrelationshipname",
+ "pk": "refold"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "Replaced by",
+  "used": true,
+  "name": "Replaces",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "replaces"
+},
+{
+ "fields": {
+  "order": 0,
+  "revname": "Updated by",
+  "used": true,
+  "name": "Updates",
+  "desc": ""
+ },
+ "model": "name.docrelationshipname",
+ "pk": "updates"
+},
 {
  "fields": {
   "order": 3,
@@ -329,31 +329,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "IANA coordination",
-  "desc": "RFC-Editor/IANA Registration Coordination"
+  "name": "Approved in minutes",
+  "desc": ""
  },
  "model": "name.doctagname",
- "pk": "iana-crd"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Holding for references",
-  "desc": "Holding for normative reference"
- },
- "model": "name.doctagname",
- "pk": "ref"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Missing references",
-  "desc": "Awaiting missing normative reference"
- },
- "model": "name.doctagname",
- "pk": "missref"
+ "pk": "app-min"
 },
 {
  "fields": {
@@ -369,61 +349,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Review by RFC Editor",
-  "desc": ""
+  "name": "Holding for references",
+  "desc": "Holding for normative reference"
  },
  "model": "name.doctagname",
- "pk": "rfc-rev"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Via RFC Editor",
-  "desc": ""
- },
- "model": "name.doctagname",
- "pk": "via-rfc"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Approved in minutes",
-  "desc": ""
- },
- "model": "name.doctagname",
- "pk": "app-min"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Shepherd Needed",
-  "desc": ""
- },
- "model": "name.doctagname",
- "pk": "need-sh"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Waiting for Dependency on Other Document",
-  "desc": ""
- },
- "model": "name.doctagname",
- "pk": "w-dep"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "IESG Review Completed",
-  "desc": ""
- },
- "model": "name.doctagname",
- "pk": "iesg-com"
+ "pk": "ref"
 },
 {
  "fields": {
@@ -439,11 +369,31 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Revised I-D Needed - Issue raised by WG",
+  "name": "IANA coordination",
+  "desc": "RFC-Editor/IANA Registration Coordination"
+ },
+ "model": "name.doctagname",
+ "pk": "iana-crd"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "IESG Review Completed",
   "desc": ""
  },
  "model": "name.doctagname",
- "pk": "rev-wg"
+ "pk": "iesg-com"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Missing references",
+  "desc": "Awaiting missing normative reference"
+ },
+ "model": "name.doctagname",
+ "pk": "missref"
 },
 {
  "fields": {
@@ -457,13 +407,53 @@
 },
 {
  "fields": {
-  "order": 1,
+  "order": 0,
   "used": true,
-  "name": "Point Raised - writeup needed",
-  "desc": "IESG discussions on the document have raised some issues that need to be brought to the attention of the authors/WG, but those issues have not been written down yet. (It is common for discussions during a telechat to result in such situations. An AD may raise a possible issue during a telechat and only decide as a result of that discussion whether the issue is worth formally writing up and bringing to the attention of the authors/WG). A document stays in the \"Point Raised - Writeup Needed\" state until *ALL* IESG comments that have been raised have been documented."
+  "name": "Review by RFC Editor",
+  "desc": ""
  },
  "model": "name.doctagname",
- "pk": "point"
+ "pk": "rfc-rev"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Revised I-D Needed - Issue raised by WG",
+  "desc": ""
+ },
+ "model": "name.doctagname",
+ "pk": "rev-wg"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Shepherd Needed",
+  "desc": ""
+ },
+ "model": "name.doctagname",
+ "pk": "need-sh"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Via RFC Editor",
+  "desc": ""
+ },
+ "model": "name.doctagname",
+ "pk": "via-rfc"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Waiting for Dependency on Other Document",
+  "desc": ""
+ },
+ "model": "name.doctagname",
+ "pk": "w-dep"
 },
 {
  "fields": {
@@ -485,6 +475,16 @@
  "model": "name.doctagname",
  "pk": "need-ed"
 },
+{
+ "fields": {
+  "order": 1,
+  "used": true,
+  "name": "Point Raised - writeup needed",
+  "desc": "IESG discussions on the document have raised some issues that need to be brought to the attention of the authors/WG, but those issues have not been written down yet. (It is common for discussions during a telechat to result in such situations. An AD may raise a possible issue during a telechat and only decide as a result of that discussion whether the issue is worth formally writing up and bringing to the attention of the authors/WG). A document stays in the \"Point Raised - Writeup Needed\" state until *ALL* IESG comments that have been raised have been documented."
+ },
+ "model": "name.doctagname",
+ "pk": "point"
+},
 {
  "fields": {
   "order": 2,
@@ -515,16 +515,6 @@
  "model": "name.doctagname",
  "pk": "w-part"
 },
-{
- "fields": {
-  "order": 3,
-  "used": true,
-  "name": "External Party",
-  "desc": "The document is awaiting review or input from an external party (i.e, someone other than the shepherding AD, the authors, or the WG). See the \"note\" field for more details on who has the action."
- },
- "model": "name.doctagname",
- "pk": "extpty"
-},
 {
  "fields": {
   "order": 3,
@@ -545,6 +535,16 @@
  "model": "name.doctagname",
  "pk": "w-review"
 },
+{
+ "fields": {
+  "order": 3,
+  "used": true,
+  "name": "External Party",
+  "desc": "The document is awaiting review or input from an external party (i.e, someone other than the shepherding AD, the authors, or the WG). See the \"note\" field for more details on who has the action."
+ },
+ "model": "name.doctagname",
+ "pk": "extpty"
+},
 {
  "fields": {
   "order": 4,
@@ -645,17 +645,6 @@
  "model": "name.doctagname",
  "pk": "other"
 },
-{
- "fields": {
-  "order": 0,
-  "prefix": "charter",
-  "used": true,
-  "name": "Charter",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "charter"
-},
 {
  "fields": {
   "order": 0,
@@ -667,105 +656,6 @@
  "model": "name.doctypename",
  "pk": "agenda"
 },
-{
- "fields": {
-  "order": 0,
-  "prefix": "minutes",
-  "used": true,
-  "name": "Minutes",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "minutes"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "slides",
-  "used": true,
-  "name": "Slides",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "slides"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "draft",
-  "used": true,
-  "name": "Draft",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "draft"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "liai-att",
-  "used": true,
-  "name": "Liaison Attachment",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "liai-att"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "conflict-review",
-  "used": true,
-  "name": "Conflict Review",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "conflrev"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "status-change",
-  "used": true,
-  "name": "Status Change",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "statchg"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "",
-  "used": false,
-  "name": "Shepherd's writeup",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "shepwrit"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "",
-  "used": false,
-  "name": "Liaison",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "liaison"
-},
-{
- "fields": {
-  "order": 0,
-  "prefix": "recording",
-  "used": true,
-  "name": "Recording",
-  "desc": ""
- },
- "model": "name.doctypename",
- "pk": "recording"
-},
 {
  "fields": {
   "order": 0,
@@ -777,6 +667,83 @@
  "model": "name.doctypename",
  "pk": "bluesheets"
 },
+{
+ "fields": {
+  "order": 0,
+  "prefix": "charter",
+  "used": true,
+  "name": "Charter",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "charter"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "conflict-review",
+  "used": true,
+  "name": "Conflict Review",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "conflrev"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "draft",
+  "used": true,
+  "name": "Draft",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "draft"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "",
+  "used": false,
+  "name": "Liaison",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "liaison"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "liai-att",
+  "used": true,
+  "name": "Liaison Attachment",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "liai-att"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "minutes",
+  "used": true,
+  "name": "Minutes",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "minutes"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "recording",
+  "used": true,
+  "name": "Recording",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "recording"
+},
 {
  "fields": {
   "order": 0,
@@ -788,6 +755,39 @@
  "model": "name.doctypename",
  "pk": "review"
 },
+{
+ "fields": {
+  "order": 0,
+  "prefix": "",
+  "used": false,
+  "name": "Shepherd's writeup",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "shepwrit"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "slides",
+  "used": true,
+  "name": "Slides",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "slides"
+},
+{
+ "fields": {
+  "order": 0,
+  "prefix": "status-change",
+  "used": true,
+  "name": "Status Change",
+  "desc": ""
+ },
+ "model": "name.doctypename",
+ "pk": "statchg"
+},
 {
  "fields": {
   "order": 1,
@@ -911,11 +911,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Questionnaire response",
+  "name": "Junk",
   "desc": ""
  },
  "model": "name.feedbacktypename",
- "pk": "questio"
+ "pk": "junk"
 },
 {
  "fields": {
@@ -931,11 +931,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Junk",
+  "name": "Questionnaire response",
   "desc": ""
  },
  "model": "name.feedbacktypename",
- "pk": "junk"
+ "pk": "questio"
 },
 {
  "fields": {
@@ -981,21 +981,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "BOF",
-  "desc": ""
+  "name": "Abandonded",
+  "desc": "Formation of the group (most likely a BoF or Proposed WG) was abandoned"
  },
  "model": "name.groupstatename",
- "pk": "bof"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Proposed",
-  "desc": ""
- },
- "model": "name.groupstatename",
- "pk": "proposed"
+ "pk": "abandon"
 },
 {
  "fields": {
@@ -1011,41 +1001,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Dormant",
+  "name": "BOF",
   "desc": ""
  },
  "model": "name.groupstatename",
- "pk": "dormant"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Concluded",
-  "desc": ""
- },
- "model": "name.groupstatename",
- "pk": "conclude"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Unknown",
-  "desc": ""
- },
- "model": "name.groupstatename",
- "pk": "unknown"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Abandonded",
-  "desc": "Formation of the group (most likely a BoF or Proposed WG) was abandoned"
- },
- "model": "name.groupstatename",
- "pk": "abandon"
+ "pk": "bof"
 },
 {
  "fields": {
@@ -1057,6 +1017,36 @@
  "model": "name.groupstatename",
  "pk": "bof-conc"
 },
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Concluded",
+  "desc": ""
+ },
+ "model": "name.groupstatename",
+ "pk": "conclude"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Dormant",
+  "desc": ""
+ },
+ "model": "name.groupstatename",
+ "pk": "dormant"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Proposed",
+  "desc": ""
+ },
+ "model": "name.groupstatename",
+ "pk": "proposed"
+},
 {
  "fields": {
   "order": 0,
@@ -1071,23 +1061,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "verbose_name": "Internet Engineering Task Force",
-  "name": "IETF",
+  "name": "Unknown",
   "desc": ""
  },
- "model": "name.grouptypename",
- "pk": "ietf"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "Area",
-  "name": "Area",
-  "desc": ""
- },
- "model": "name.grouptypename",
- "pk": "area"
+ "model": "name.groupstatename",
+ "pk": "unknown"
 },
 {
  "fields": {
@@ -1104,89 +1082,23 @@
  "fields": {
   "order": 0,
   "used": true,
-  "verbose_name": "Working Group",
-  "name": "WG",
-  "desc": "Working group"
- },
- "model": "name.grouptypename",
- "pk": "wg"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "Research Group",
-  "name": "RG",
-  "desc": "Research group"
- },
- "model": "name.grouptypename",
- "pk": "rg"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "Team",
-  "name": "Team",
+  "verbose_name": "Area",
+  "name": "Area",
   "desc": ""
  },
  "model": "name.grouptypename",
- "pk": "team"
+ "pk": "area"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "verbose_name": "An Individual",
-  "name": "Individual",
-  "desc": ""
+  "verbose_name": "Area Directorate",
+  "name": "Directorate",
+  "desc": "In many areas, the Area Directors have formed an advisory group or directorate.  These comprise experienced members of the IETF and the technical community represented by the area.  The specific name and the details of the role for each group differ from area to area, but  the primary intent is that these groups assist the Area Director(s), e.g., with the review of specifications produced in the area."
  },
  "model": "name.grouptypename",
- "pk": "individ"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "Standards Organization",
-  "name": "SDO",
-  "desc": "Standards organization"
- },
- "model": "name.grouptypename",
- "pk": "sdo"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "Internet Research Task Force",
-  "name": "IRTF",
-  "desc": ""
- },
- "model": "name.grouptypename",
- "pk": "irtf"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "The RFC Editor",
-  "name": "RFC Editor",
-  "desc": ""
- },
- "model": "name.grouptypename",
- "pk": "rfcedtyp"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "verbose_name": "IETF/IAB Nominating Committee",
-  "name": "Nomcom",
-  "desc": "An IETF/IAB Nominating Committee.  Use 'SDO' for external nominating committees."
- },
- "model": "name.grouptypename",
- "pk": "nomcom"
+ "pk": "dir"
 },
 {
  "fields": {
@@ -1199,6 +1111,39 @@
  "model": "name.grouptypename",
  "pk": "iab"
 },
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "Internet Engineering Task Force",
+  "name": "IETF",
+  "desc": ""
+ },
+ "model": "name.grouptypename",
+ "pk": "ietf"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "An Individual",
+  "name": "Individual",
+  "desc": ""
+ },
+ "model": "name.grouptypename",
+ "pk": "individ"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "Internet Research Task Force",
+  "name": "IRTF",
+  "desc": ""
+ },
+ "model": "name.grouptypename",
+ "pk": "irtf"
+},
 {
  "fields": {
   "order": 0,
@@ -1214,12 +1159,67 @@
  "fields": {
   "order": 0,
   "used": true,
-  "verbose_name": "Area Directorate",
-  "name": "Directorate",
-  "desc": "In many areas, the Area Directors have formed an advisory group or directorate.  These comprise experienced members of the IETF and the technical community represented by the area.  The specific name and the details of the role for each group differ from area to area, but  the primary intent is that these groups assist the Area Director(s), e.g., with the review of specifications produced in the area."
+  "verbose_name": "IETF/IAB Nominating Committee",
+  "name": "Nomcom",
+  "desc": "An IETF/IAB Nominating Committee.  Use 'SDO' for external nominating committees."
  },
  "model": "name.grouptypename",
- "pk": "dir"
+ "pk": "nomcom"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "The RFC Editor",
+  "name": "RFC Editor",
+  "desc": ""
+ },
+ "model": "name.grouptypename",
+ "pk": "rfcedtyp"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "Research Group",
+  "name": "RG",
+  "desc": "Research group"
+ },
+ "model": "name.grouptypename",
+ "pk": "rg"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "Standards Organization",
+  "name": "SDO",
+  "desc": "Standards organization"
+ },
+ "model": "name.grouptypename",
+ "pk": "sdo"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "Team",
+  "name": "Team",
+  "desc": ""
+ },
+ "model": "name.grouptypename",
+ "pk": "team"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "verbose_name": "Working Group",
+  "name": "WG",
+  "desc": "Working group"
+ },
+ "model": "name.grouptypename",
+ "pk": "wg"
 },
 {
  "fields": {
@@ -1345,61 +1345,31 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Submitted",
+  "name": "Changed disclosure metadata",
   "desc": ""
  },
  "model": "name.ipreventtypename",
- "pk": "submitted"
+ "pk": "changed_disclosure"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Posted",
+  "name": "Comment",
   "desc": ""
  },
  "model": "name.ipreventtypename",
- "pk": "posted"
+ "pk": "comment"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Removed",
+  "name": "Legacy",
   "desc": ""
  },
  "model": "name.ipreventtypename",
- "pk": "removed"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Rejected",
-  "desc": ""
- },
- "model": "name.ipreventtypename",
- "pk": "rejected"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Pending",
-  "desc": ""
- },
- "model": "name.ipreventtypename",
- "pk": "pending"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Parked",
-  "desc": ""
- },
- "model": "name.ipreventtypename",
- "pk": "parked"
+ "pk": "legacy"
 },
 {
  "fields": {
@@ -1425,11 +1395,31 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Comment",
+  "name": "Parked",
   "desc": ""
  },
  "model": "name.ipreventtypename",
- "pk": "comment"
+ "pk": "parked"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Pending",
+  "desc": ""
+ },
+ "model": "name.ipreventtypename",
+ "pk": "pending"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Posted",
+  "desc": ""
+ },
+ "model": "name.ipreventtypename",
+ "pk": "posted"
 },
 {
  "fields": {
@@ -1445,11 +1435,31 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Legacy",
+  "name": "Rejected",
   "desc": ""
  },
  "model": "name.ipreventtypename",
- "pk": "legacy"
+ "pk": "rejected"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Removed",
+  "desc": ""
+ },
+ "model": "name.ipreventtypename",
+ "pk": "removed"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Submitted",
+  "desc": ""
+ },
+ "model": "name.ipreventtypename",
+ "pk": "submitted"
 },
 {
  "fields": {
@@ -1461,16 +1471,6 @@
  "model": "name.ipreventtypename",
  "pk": "update_notify"
 },
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Changed disclosure metadata",
-  "desc": ""
- },
- "model": "name.ipreventtypename",
- "pk": "changed_disclosure"
-},
 {
  "fields": {
   "order": 0,
@@ -1761,16 +1761,6 @@
  "model": "name.meetingtypename",
  "pk": "interim"
 },
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Nominated, pending response",
-  "desc": ""
- },
- "model": "name.nomineepositionstatename",
- "pk": "pending"
-},
 {
  "fields": {
   "order": 0,
@@ -1791,6 +1781,16 @@
  "model": "name.nomineepositionstatename",
  "pk": "declined"
 },
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Nominated, pending response",
+  "desc": ""
+ },
+ "model": "name.nomineepositionstatename",
+ "pk": "pending"
+},
 {
  "fields": {
   "order": 1,
@@ -2061,16 +2061,6 @@
  "model": "name.rolename",
  "pk": "execdir"
 },
-{
- "fields": {
-  "order": 3,
-  "used": true,
-  "name": "Incoming Area Director",
-  "desc": ""
- },
- "model": "name.rolename",
- "pk": "pre-ad"
-},
 {
  "fields": {
   "order": 3,
@@ -2083,13 +2073,23 @@
 },
 {
  "fields": {
-  "order": 4,
+  "order": 3,
   "used": true,
-  "name": "Tech Advisor",
+  "name": "Incoming Area Director",
   "desc": ""
  },
  "model": "name.rolename",
- "pk": "techadv"
+ "pk": "pre-ad"
+},
+{
+ "fields": {
+  "order": 4,
+  "used": true,
+  "name": "Advisor",
+  "desc": "Advisor in a group that has explicit membership, such as the NomCom"
+ },
+ "model": "name.rolename",
+ "pk": "advisor"
 },
 {
  "fields": {
@@ -2105,21 +2105,11 @@
  "fields": {
   "order": 4,
   "used": true,
-  "name": "Advisor",
-  "desc": "Advisor in a group that has explicit membership, such as the NomCom"
- },
- "model": "name.rolename",
- "pk": "advisor"
-},
-{
- "fields": {
-  "order": 5,
-  "used": true,
-  "name": "Editor",
+  "name": "Tech Advisor",
   "desc": ""
  },
  "model": "name.rolename",
- "pk": "editor"
+ "pk": "techadv"
 },
 {
  "fields": {
@@ -2133,13 +2123,13 @@
 },
 {
  "fields": {
-  "order": 6,
+  "order": 5,
   "used": true,
-  "name": "Secretary",
+  "name": "Editor",
   "desc": ""
  },
  "model": "name.rolename",
- "pk": "secr"
+ "pk": "editor"
 },
 {
  "fields": {
@@ -2151,6 +2141,16 @@
  "model": "name.rolename",
  "pk": "delegate"
 },
+{
+ "fields": {
+  "order": 6,
+  "used": true,
+  "name": "Secretary",
+  "desc": ""
+ },
+ "model": "name.rolename",
+ "pk": "secr"
+},
 {
  "fields": {
   "order": 7,
@@ -2215,31 +2215,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "LCD projector",
-  "desc": "The room will have a computer projector"
+  "name": "Audio Stream",
+  "desc": "Audio streaming support"
  },
  "model": "name.roomresourcename",
- "pk": "project"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "second LCD projector",
-  "desc": "The room will have a second computer projector"
- },
- "model": "name.roomresourcename",
- "pk": "proj2"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Meetecho Support",
-  "desc": "The room will have a meetecho wrangler"
- },
- "model": "name.roomresourcename",
- "pk": "meetecho"
+ "pk": "audiostream"
 },
 {
  "fields": {
@@ -2255,31 +2235,31 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Audio Stream",
-  "desc": "Audio streaming support"
+  "name": "LCD projector",
+  "desc": "The room will have a computer projector"
  },
  "model": "name.roomresourcename",
- "pk": "audiostream"
+ "pk": "project"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Waiting for Scheduling",
-  "desc": ""
+  "name": "Meetecho Support",
+  "desc": "The room will have a meetecho wrangler"
  },
- "model": "name.sessionstatusname",
- "pk": "schedw"
+ "model": "name.roomresourcename",
+ "pk": "meetecho"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Waiting for Approval",
-  "desc": ""
+  "name": "second LCD projector",
+  "desc": "The room will have a second computer projector"
  },
- "model": "name.sessionstatusname",
- "pk": "apprw"
+ "model": "name.roomresourcename",
+ "pk": "proj2"
 },
 {
  "fields": {
@@ -2291,16 +2271,6 @@
  "model": "name.sessionstatusname",
  "pk": "appr"
 },
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Scheduled",
-  "desc": ""
- },
- "model": "name.sessionstatusname",
- "pk": "sched"
-},
 {
  "fields": {
   "order": 0,
@@ -2311,6 +2281,26 @@
  "model": "name.sessionstatusname",
  "pk": "canceled"
 },
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Cancelled - Pre Announcement",
+  "desc": ""
+ },
+ "model": "name.sessionstatusname",
+ "pk": "canceledpa"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Deleted",
+  "desc": ""
+ },
+ "model": "name.sessionstatusname",
+ "pk": "deleted"
+},
 {
  "fields": {
   "order": 0,
@@ -2335,11 +2325,11 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Deleted",
+  "name": "Scheduled",
   "desc": ""
  },
  "model": "name.sessionstatusname",
- "pk": "deleted"
+ "pk": "sched"
 },
 {
  "fields": {
@@ -2355,21 +2345,31 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Cancelled - Pre Announcement",
+  "name": "Waiting for Approval",
   "desc": ""
  },
  "model": "name.sessionstatusname",
- "pk": "canceledpa"
+ "pk": "apprw"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Internet Standard",
+  "name": "Waiting for Scheduling",
+  "desc": ""
+ },
+ "model": "name.sessionstatusname",
+ "pk": "schedw"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Best Current Practice",
   "desc": ""
  },
  "model": "name.stdlevelname",
- "pk": "std"
+ "pk": "bcp"
 },
 {
  "fields": {
@@ -2385,11 +2385,21 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Proposed Standard",
+  "name": "Experimental",
   "desc": ""
  },
  "model": "name.stdlevelname",
- "pk": "ps"
+ "pk": "exp"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Historic",
+  "desc": ""
+ },
+ "model": "name.stdlevelname",
+ "pk": "hist"
 },
 {
  "fields": {
@@ -2405,31 +2415,21 @@
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Experimental",
+  "name": "Internet Standard",
   "desc": ""
  },
  "model": "name.stdlevelname",
- "pk": "exp"
+ "pk": "std"
 },
 {
  "fields": {
   "order": 0,
   "used": true,
-  "name": "Best Current Practice",
+  "name": "Proposed Standard",
   "desc": ""
  },
  "model": "name.stdlevelname",
- "pk": "bcp"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Historic",
-  "desc": ""
- },
- "model": "name.stdlevelname",
- "pk": "hist"
+ "pk": "ps"
 },
 {
  "fields": {
@@ -2491,26 +2491,6 @@
  "model": "name.streamname",
  "pk": "legacy"
 },
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Other",
-  "desc": ""
- },
- "model": "name.timeslottypename",
- "pk": "other"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Session",
-  "desc": ""
- },
- "model": "name.timeslottypename",
- "pk": "session"
-},
 {
  "fields": {
   "order": 0,
@@ -2521,46 +2501,6 @@
  "model": "name.timeslottypename",
  "pk": "break"
 },
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Registration",
-  "desc": ""
- },
- "model": "name.timeslottypename",
- "pk": "reg"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Plenary",
-  "desc": ""
- },
- "model": "name.timeslottypename",
- "pk": "plenary"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Room Unavailable",
-  "desc": "A room was not booked for the timeslot indicated"
- },
- "model": "name.timeslottypename",
- "pk": "unavail"
-},
-{
- "fields": {
-  "order": 0,
-  "used": true,
-  "name": "Room Reserved",
-  "desc": "A room has been reserved for use by another body the timeslot indicated"
- },
- "model": "name.timeslottypename",
- "pk": "reserved"
-},
 {
  "fields": {
   "order": 0,
@@ -2581,6 +2521,66 @@
  "model": "name.timeslottypename",
  "pk": "offagenda"
 },
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Other",
+  "desc": ""
+ },
+ "model": "name.timeslottypename",
+ "pk": "other"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Plenary",
+  "desc": ""
+ },
+ "model": "name.timeslottypename",
+ "pk": "plenary"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Registration",
+  "desc": ""
+ },
+ "model": "name.timeslottypename",
+ "pk": "reg"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Room Reserved",
+  "desc": "A room has been reserved for use by another body the timeslot indicated"
+ },
+ "model": "name.timeslottypename",
+ "pk": "reserved"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Room Unavailable",
+  "desc": "A room was not booked for the timeslot indicated"
+ },
+ "model": "name.timeslottypename",
+ "pk": "unavail"
+},
+{
+ "fields": {
+  "order": 0,
+  "used": true,
+  "name": "Session",
+  "desc": ""
+ },
+ "model": "name.timeslottypename",
+ "pk": "session"
+},
 {
  "fields": {
   "label": "State"
@@ -5033,7 +5033,7 @@
 },
 {
  "fields": {
-  "template": "{% if group.stream_id == 'ietf' %}IETF-Announce <ietf-announce@ietf.org>{% elif group.stream_id == 'irtf' %}IRTF-Announce <irtf-announce@irtf.org>{% endif %}",
+  "template": "{% if group.type_id == 'wg' %}IETF-Announce <ietf-announce@ietf.org>{% elif group.type_id == 'rg' %}IRTF-Announce <irtf-announce@irtf.org>{% endif %}",
   "desc": "The group's stream's announce list"
  },
  "model": "mailtrigger.recipient",
@@ -5527,19 +5527,6 @@
  "model": "mailtrigger.mailtrigger",
  "pk": "charter_internal_review"
 },
-{
- "fields": {
-  "cc": [
-   "group_mail_list"
-  ],
-  "to": [
-   "ietf_announce"
-  ],
-  "desc": "Recipients when an interim meeting is announced"
- },
- "model": "mailtrigger.mailtrigger",
- "pk": "interim_announced"
-},
 {
  "fields": {
   "cc": [],
@@ -5847,6 +5834,19 @@
  "model": "mailtrigger.mailtrigger",
  "pk": "group_personnel_change"
 },
+{
+ "fields": {
+  "cc": [
+   "group_mail_list"
+  ],
+  "to": [
+   "ietf_announce"
+  ],
+  "desc": "Recipients when an interim meeting is announced"
+ },
+ "model": "mailtrigger.mailtrigger",
+ "pk": "interim_announced"
+},
 {
  "fields": {
   "cc": [],