diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java
index f31bbff8a..40da3b7f4 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java
@@ -68,7 +68,7 @@ public class BundleRenderer extends ResourceRenderer {
       // nothing
     } else {
       XhtmlNode root = new XhtmlNode(NodeType.Element, "div");
-      root.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_ROOT, b.getId(), b.get("type").primitiveValue()));
+      root.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_ROOT, b.getId(), b.get("type").primitiveValue()));
       int i = 0;
       for (BaseWrapper be : entries) {
         i++;
@@ -85,9 +85,9 @@ public class BundleRenderer extends ResourceRenderer {
         }
         root.hr();
         if (be.has("fullUrl")) {
-          root.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_ENTRY_URL, Integer.toString(i), be.get("fullUrl").primitiveValue()));
+          root.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_ENTRY_URL, Integer.toString(i), be.get("fullUrl").primitiveValue()));
         } else {
-          root.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_ENTRY, Integer.toString(i)));
+          root.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_ENTRY, Integer.toString(i)));
         }
 //        if (be.hasRequest())
 //          renderRequest(root, be.getRequest());
@@ -96,7 +96,7 @@ public class BundleRenderer extends ResourceRenderer {
 //        if (be.hasResponse())
 //          renderResponse(root, be.getResponse());
         if (be.has("resource")) {
-          root.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_RESOURCE, be.get("resource").fhirType()));
+          root.para().addText(formatMessage(RenderingContext.BUNDLE_RESOURCE, be.get("resource").fhirType()));
           ResourceWrapper rw = be.getChildByName("resource").getAsResource();
           XhtmlNode xn = rw.getNarrative();
           if (xn == null || xn.isEmpty()) {
@@ -286,9 +286,9 @@ public class BundleRenderer extends ResourceRenderer {
         start = 1;
         docMode = true;
         x.hr();
-        x.h2().addText(formatMessage(RenderingContext.RENDER_BUNDLE_DOCUMENT_CONTENT, b.getId(), b.getType().toCode()));
+        x.h2().addText(formatMessage(RenderingContext.BUNDLE_DOCUMENT_CONTENT, b.getId(), b.getType().toCode()));
       } else {
-        x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_ROOT, b.getId(), b.getType().toCode()));
+        x.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_ROOT, b.getId(), b.getType().toCode()));
       }
       int i = 0;
       for (BundleEntryComponent be : b.getEntry()) {
@@ -307,17 +307,17 @@ public class BundleRenderer extends ResourceRenderer {
           x.hr();
           if (docMode) {
             if (be.hasFullUrl() && be.hasResource()) {
-              x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_DOC_ENTRY_URD, Integer.toString(i), be.getFullUrl(), be.getResource().fhirType(), be.getResource().getIdBase()));
+              x.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_DOC_ENTRY_URD, Integer.toString(i), be.getFullUrl(), be.getResource().fhirType(), be.getResource().getIdBase()));
             } else if (be.hasFullUrl()) {
-              x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_DOC_ENTRY_U, Integer.toString(i), be.getFullUrl()));
+              x.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_DOC_ENTRY_U, Integer.toString(i), be.getFullUrl()));
             } else if (be.hasResource()) {
-              x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_DOC_ENTRY_RD, Integer.toString(i), be.getResource().fhirType(), be.getResource().getIdBase()));              
+              x.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_DOC_ENTRY_RD, Integer.toString(i), be.getResource().fhirType(), be.getResource().getIdBase()));              
             }
           } else {
             if (be.hasFullUrl()) {
-              x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_ENTRY_URL, Integer.toString(i), be.getFullUrl()));
+              x.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_ENTRY_URL, Integer.toString(i), be.getFullUrl()));
             } else {
-              x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_HEADER_ENTRY, Integer.toString(i)));
+              x.para().addText(formatMessage(RenderingContext.BUNDLE_HEADER_ENTRY, Integer.toString(i)));
             }
             if (be.hasRequest())
               renderRequest(x, be.getRequest());
@@ -328,7 +328,7 @@ public class BundleRenderer extends ResourceRenderer {
           }
           if (be.hasResource()) {
             if (!docMode) {
-              x.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_RESOURCE, be.getResource().fhirType()));
+              x.para().addText(formatMessage(RenderingContext.BUNDLE_RESOURCE, be.getResource().fhirType()));
             }
             if (be.hasResource()) {
               XhtmlNode xn = null;
@@ -401,42 +401,42 @@ public class BundleRenderer extends ResourceRenderer {
 
   private void renderSearch(XhtmlNode root, BundleEntrySearchComponent search) {
     StringBuilder b = new StringBuilder();
-    b.append(formatMessage(RenderingContext.RENDER_BUNDLE_SEARCH));
+    b.append(formatMessage(RenderingContext.BUNDLE_SEARCH));
     if (search.hasMode())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_SEARCH_MODE, search.getMode().toCode()));
+      b.append(formatMessage(RenderingContext.BUNDLE_SEARCH_MODE, search.getMode().toCode()));
     if (search.hasScore()) {
       if (search.hasMode())
         b.append(",");
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_SEARCH_SCORE, search.getScore()));
+      b.append(formatMessage(RenderingContext.BUNDLE_SEARCH_SCORE, search.getScore()));
     }
     root.para().addText(b.toString());    
   }
 
   private void renderResponse(XhtmlNode root, BundleEntryResponseComponent response) {
-    root.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_RESPONSE));
+    root.para().addText(formatMessage(RenderingContext.BUNDLE_RESPONSE));
     StringBuilder b = new StringBuilder();
     b.append(response.getStatus()+"\r\n");
     if (response.hasLocation())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_LOCATION, response.getLocation())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_LOCATION, response.getLocation())+"\r\n");
     if (response.hasEtag())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_ETAG, response.getEtag())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_ETAG, response.getEtag())+"\r\n");
     if (response.hasLastModified())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_LAST_MOD, response.getEtag())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_LAST_MOD, response.getEtag())+"\r\n");
     root.pre().addText(b.toString());    
   }
 
   private void renderRequest(XhtmlNode root, BundleEntryRequestComponent request) {
-    root.para().addText(formatMessage(RenderingContext.RENDER_BUNDLE_REQUEST));
+    root.para().addText(formatMessage(RenderingContext.BUNDLE_REQUEST));
     StringBuilder b = new StringBuilder();
     b.append(request.getMethod()+" "+request.getUrl()+"\r\n");
     if (request.hasIfNoneMatch())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_IF_NON_MATCH, request.getIfNoneMatch())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_IF_NON_MATCH, request.getIfNoneMatch())+"\r\n");
     if (request.hasIfModifiedSince())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_IF_MOD, request.getIfModifiedSince())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_IF_MOD, request.getIfModifiedSince())+"\r\n");
     if (request.hasIfMatch())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_IF_MATCH, request.getIfMatch())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_IF_MATCH, request.getIfMatch())+"\r\n");
     if (request.hasIfNoneExist())
-      b.append(formatMessage(RenderingContext.RENDER_BUNDLE_IF_NONE, request.getIfNoneExist())+"\r\n");
+      b.append(formatMessage(RenderingContext.BUNDLE_IF_NONE, request.getIfNoneExist())+"\r\n");
     root.pre().addText(b.toString());    
   }
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java
index aa81505f3..8cd749838 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java
@@ -82,13 +82,13 @@ public class CodeSystemRenderer extends TerminologyRenderer {
   
   private void generateFilters(XhtmlNode x, CodeSystem cs) {
     if (cs.hasFilter()) {
-      x.para().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_FILTERS));
+      x.para().b().tx(formatMessage(RenderingContext.CODESYSTEM_FILTERS));
       XhtmlNode tbl = x.table("grid");
       XhtmlNode tr = tbl.tr();
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_FILTER_CODE));
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_FILTER_DESC));
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_FILTER_OP));
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_FILTER_VALUE));
+      tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_FILTER_CODE));
+      tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_FILTER_DESC));
+      tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_FILTER_OP));
+      tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_FILTER_VALUE));
       for (CodeSystemFilterComponent f : cs.getFilter()) {
         tr = tbl.tr();
         renderStatus(f, tr.td()).tx(f.getCode());
@@ -112,20 +112,20 @@ public class CodeSystemRenderer extends TerminologyRenderer {
         hasDescription = hasDescription || p.hasDescription();
       }
       
-      x.para().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROPS));
-      x.para().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROPS_DESC));
+      x.para().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROPS));
+      x.para().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROPS_DESC));
       XhtmlNode tbl = x.table("grid");
       XhtmlNode tr = tbl.tr();
       if (hasRendered) {
-        tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROP_NAME));        
+        tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROP_NAME));        
       }
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROP_CODE));
+      tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROP_CODE));
       if (hasURI) {
-        tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROP_URI));
+        tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROP_URI));
       }
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROP_TYPE));
+      tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROP_TYPE));
       if (hasDescription) {
-        tr.td().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_PROP_DESC));
+        tr.td().b().tx(formatMessage(RenderingContext.CODESYSTEM_PROP_DESC));
       }
       for (PropertyComponent p : cs.getProperty()) {
         tr = tbl.tr();
@@ -149,10 +149,10 @@ public class CodeSystemRenderer extends TerminologyRenderer {
 
   private String sentenceForContent(CodeSystemContentMode mode, CodeSystem cs) {
     switch (mode) {
-    case COMPLETE: return formatMessage(I18nConstants.RND_CS_CONTENT_COMPLETE);
-    case EXAMPLE: return formatMessage(I18nConstants.RND_CS_CONTENT_EXAMPLE);
-    case FRAGMENT: return formatMessage(I18nConstants.RND_CS_CONTENT_FRAGMENT);
-    case NOTPRESENT: return formatMessage(I18nConstants.RND_CS_CONTENT_NOTPRESENT);
+    case COMPLETE: return formatMessage(RenderingContext.CODESYSTEM_CONTENT_COMPLETE);
+    case EXAMPLE: return formatMessage(RenderingContext.CODESYSTEM_CONTENT_EXAMPLE);
+    case FRAGMENT: return formatMessage(RenderingContext.CODESYSTEM_CONTENT_FRAGMENT);
+    case NOTPRESENT: return formatMessage(RenderingContext.CODESYSTEM_CONTENT_NOTPRESENT);
     case SUPPLEMENT:
       boolean properties = CodeSystemUtilities.hasProperties(cs);
       boolean designations = CodeSystemUtilities.hasDesignations(cs); 
@@ -166,7 +166,7 @@ public class CodeSystemRenderer extends TerminologyRenderer {
       } else {
         features = /*!#*/"features"; // ?
       }
-      return formatMessage(I18nConstants.RND_CS_CONTENT_SUPPLEMENT, features);
+      return formatMessage(RenderingContext.CODESYSTEM_CONTENT_SUPPLEMENT, features);
     default:
       throw new FHIRException(/*!#*/"Unknown CodeSystemContentMode mode");
     }
@@ -174,7 +174,7 @@ public class CodeSystemRenderer extends TerminologyRenderer {
   
   private boolean generateCodeSystemContent(XhtmlNode x, CodeSystem cs, boolean hasExtensions, List<UsedConceptMap> maps, boolean props) throws FHIRFormatError, DefinitionException, IOException {
     if (props) {
-      x.para().b().tx(formatMessage(RenderingContext.RENDER_CODESYSTEM_CONCEPTS));
+      x.para().b().tx(formatMessage(RenderingContext.CODESYSTEM_CONCEPTS));
     }
     XhtmlNode p = x.para();
     renderStatus(cs.getUrlElement(), p.param("cs")).code().tx(cs.getUrl());
@@ -463,7 +463,7 @@ public class CodeSystemRenderer extends TerminologyRenderer {
       td = tr.td();
       Boolean b = CodeSystemUtilities.isDeprecated(cs, c, false);
       if (b !=  null && b) {
-        smartAddText(td, formatMessage(RenderingContext.RENDER_CODESYSTEM_DEPRECATED));
+        smartAddText(td, formatMessage(RenderingContext.CODESYSTEM_DEPRECATED));
         hasExtensions = true;
         if (ToolingExtensions.hasExtension(c, ToolingExtensions.EXT_REPLACED_BY)) {
           Coding cc = (Coding) ToolingExtensions.getExtension(c, ToolingExtensions.EXT_REPLACED_BY).getValue();
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java
index 898b16ecc..d3ff47516 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java
@@ -222,21 +222,25 @@ public class PatientRenderer extends ResourceRenderer {
 
   private String display(HumanName name, String gender, DateType dob, Identifier id) {
     StringBuilder b = new StringBuilder();
-    b.append(display(name));
+    if (name == null) {
+      b.append(display(name));
+    } else {
+      b.append(context.formatMessage(RenderingContext.PAT_NO_NAME));      
+    }
     b.append(" ");
     if (dob == null) {
-      b.append("(no stated gender)"/*!#*/);
+      b.append(context.formatMessage(RenderingContext.PAT_NO_GENDER));
     } else {
       b.append(gender);
     }
     b.append(", ");
     if (dob == null) {
-      b.append("DoB Unknown"/*!#*/);
+      b.append(context.formatMessage(RenderingContext.PAT_NO_DOB));
     } else {
-      b.append(/*!#*/"DoB: "+display(dob));      
+      b.append(context.formatMessage(RenderingContext.PAT_DOB, display(dob)));      
     }
     if (id != null) {
-      b.append(" "+/*!#*/"( ");      
+      b.append(" ( ");      
       b.append(display(id));
       b.append(")");      
     }
@@ -245,22 +249,21 @@ public class PatientRenderer extends ResourceRenderer {
   
   public void describe(XhtmlNode x, HumanName name, String gender, DateType dob, Identifier id) throws UnsupportedEncodingException, IOException {
     if (name == null) {
-      x.b().tx(/*!#*/"Anonymous Patient"); // todo: is this appropriate?  
+      x.b().tx(context.formatMessage(RenderingContext.PAT_NO_NAME)); // todo: is this appropriate?  
     } else {
       render(x.b(), name);
     }
     x.tx(" ");
     if (gender == null) {
-      x.tx(/*!#*/"(no stated gender)");
+      x.tx(context.formatMessage(RenderingContext.PAT_NO_GENDER));
     } else {
       x.tx(gender);
     }
     x.tx(", ");
     if (dob == null) {
-      x.tx(/*!#*/"DoB Unknown");
+      x.tx(context.formatMessage(RenderingContext.PAT_NO_DOB));
     } else {
-      x.tx(/*!#*/"DoB: ");
-      render(x, dob);
+      x.tx(context.formatMessage(RenderingContext.PAT_DOB, display(dob)));
     }
     if (id != null) {
       x.tx(" ( ");      
@@ -298,7 +301,7 @@ public class PatientRenderer extends ResourceRenderer {
     }
     if (r.has("contained") && context.isTechnicalMode()) {
       x.hr();
-      x.para().b().tx(/*!#*/"Contained Resources");
+      x.para().b().tx(context.formatMessagePlural(r.getContained().size(), RenderingContext.PAT_CONTAINED));
       addContained(x, r.getContained());
     }
     return false;
@@ -390,20 +393,18 @@ public class PatientRenderer extends ResourceRenderer {
     if (id != null) {
       ids.remove(id);
     };
-    if (ids.size() == 1) {
+    if (ids.size() > 0) {
       XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Other Id:", /*!#*/"Other Ids (see the one above)");
+      nameCell(tr, context.formatMessagePlural(ids.size(), RenderingContext.PAT_OTHER_ID),context.formatMessagePlural(ids.size(), RenderingContext.PAT_OTHER_ID_HINT));
       XhtmlNode td = tr.td();
       td.colspan("3");
-      render(r, td, ids.get(0));
-    } else if (ids.size() > 1) {
-      XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Other Ids:", /*!#*/"Other Ids (see the one above)");
-      XhtmlNode td = tr.td();
-      td.colspan("3");
-      XhtmlNode ul = td.ul();
-      for (Identifier i : ids) {
-        render(r, ul.li(), i);
+      if (ids.size() == 1) {
+        render(r, td, ids.get(0));
+      } else { 
+        XhtmlNode ul = td.ul();
+        for (Identifier i : ids) {
+          render(r, ul.li(), i);
+        }
       }
     }
   }
@@ -423,44 +424,41 @@ public class PatientRenderer extends ResourceRenderer {
         }
       }
     }
-    if (langs.size() == 1) {
+    if (langs.size() > 0) {
       XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Language:", /*!#*/"Languages spoken");
+      nameCell(tr, context.formatMessagePlural(langs.size(), RenderingContext.PAT_LANG), context.formatMessagePlural(langs.size(), RenderingContext.PAT_LANG_HINT));
       XhtmlNode td = tr.td();
       td.colspan("3");
-      render(r, td, langs.get(0));
-      if (prefLang != null) {
-        td.tx(" "+/*!#*/"(preferred)");
-      }
-    } else if (langs.size() > 1) {
-      XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Languages:", /*!#*/"Languages spoken");
-      XhtmlNode td = tr.td();
-      td.colspan("3");
-      XhtmlNode ul = td.ul();
-      for (CodeableConcept i : langs) {
-        XhtmlNode li = ul.li();
-        render(r, li, i);
-        if (i == prefLang) {
-          li.tx(" "+/*!#*/"(preferred)");
+      if (langs.size() == 1) {
+        render(r, td, langs.get(0));
+        if (prefLang != null) {
+          td.tx(" "+context.formatMessage(RenderingContext.PAT_LANG_PREFERRED));
+        }
+      } else if (langs.size() > 1) {
+        XhtmlNode ul = td.ul();
+        for (CodeableConcept i : langs) {
+          XhtmlNode li = ul.li();
+          render(r, li, i);
+          if (i == prefLang) {
+            li.tx(" "+context.formatMessage(RenderingContext.PAT_LANG_PREFERRED));;
+          }
         }
       }
     }
   }
 
-
   private void addLinks(XhtmlNode tbl, ResourceWrapper r) throws UnsupportedEncodingException, FHIRException, IOException {
     List<NamedReferance> refs = new ArrayList<>();
     PropertyWrapper pw = getProperty(r, "generalPractitioner");
     if (pw != null) {
       for (BaseWrapper t : pw.getValues()) {
-        refs.add(new NamedReferance(/*!#*/"General Practitioner", (Reference) t.getBase(), t));
+        refs.add(new NamedReferance(context.formatMessage(RenderingContext.PAT_GP), (Reference) t.getBase(), t));
       }
     }
     pw = getProperty(r, "managingOrganization");
     if (pw != null) {
       for (BaseWrapper t : pw.getValues()) {
-        refs.add(new NamedReferance(/*!#*/"Managing Organization", (Reference) t.getBase(), t));
+        refs.add(new NamedReferance(context.formatMessage(RenderingContext.PAT_MO), (Reference) t.getBase(), t));
       }
     }
     pw = getProperty(r, "link");
@@ -484,7 +482,7 @@ public class PatientRenderer extends ResourceRenderer {
     
     if (refs.size() > 0) {      
       XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Links:", /*!#*/"Patient Links");
+      nameCell(tr, context.formatMessage(RenderingContext.PAT_LINKS), context.formatMessage(RenderingContext.PAT_LINKS_HINT));
       XhtmlNode td = tr.td();
       td.colspan("3");
       XhtmlNode ul = td.ul();
@@ -499,10 +497,10 @@ public class PatientRenderer extends ResourceRenderer {
 
   private String describeLinkedRecord(String type) {
     switch (type) {
-    case "replaced-by" : return /*!#*/"This record replaced by";
-    case "replaces": return /*!#*/"This record replaces";
-    case "refer": return /*!#*/"Please refer to";
-    case "seealso": return /*!#*/"Also see";
+    case "replaced-by" : return context.formatMessage(RenderingContext.PAT_LINK_REPLBY);
+    case "replaces": return context.formatMessage(RenderingContext.PAT_LINK_REPL);
+    case "refer": return context.formatMessage(RenderingContext.PAT_LINK_REFER);
+    case "seealso": return context.formatMessage(RenderingContext.PAT_LINK_SEE);
     }
     return "Unknown";
   }
@@ -564,9 +562,9 @@ public class PatientRenderer extends ResourceRenderer {
     }
     XhtmlNode tr = tbl.tr();
     if (rels.size() == 1) {
-      nameCell(tr, (rels.get(0).getCodingFirstRep().hasDisplay() ? rels.get(0).getCodingFirstRep().getDisplay() : display(rels.get(0)))+":", /*!#*/"Nominated Contact: "+display(rels.get(0)));
+      nameCell(tr, (rels.get(0).getCodingFirstRep().hasDisplay() ? rels.get(0).getCodingFirstRep().getDisplay() : display(rels.get(0)))+":",  context.formatMessage(RenderingContext.PAT_NOM_CONTACT)+" "+display(rels.get(0)));
     } else {
-      nameCell(tr, /*!#*/"Contact", /*!#*/"Patient contact");
+      nameCell(tr, context.formatMessage(RenderingContext.PAT_NOK_CONTACT), context.formatMessage(RenderingContext.PAT_NOK_CONTACT_HINT));
     }
     XhtmlNode td = tr.td();
     td.colspan("3");
@@ -576,15 +574,15 @@ public class PatientRenderer extends ResourceRenderer {
       li = ul.li();
       render(r, li, name);
       if (gender != null) {
-        li.tx(" "+/*!#*/"("+gender+")");
+        li.tx(" "+"("+gender+")");
       }
     } else if (gender != null) {
       li = ul.li();
-      li.tx(/*!#*/"Gender: "+gender);      
+      li.tx(context.formatMessage(RenderingContext.PAT_GENDER, gender));      
     }
     if (rels.size() > 1) {
       li = ul.li();
-      li.tx(/*!#*/"Relationships: ");
+      li.tx(context.formatMessage(RenderingContext.PAT_RELN));
       boolean first = true;
       for (CodeableConcept rel : rels) {
         if (first) first = false; else li.tx(", ");
@@ -599,12 +597,12 @@ public class PatientRenderer extends ResourceRenderer {
     }
     if (organization != null) {
       li = ul.li();
-      li.tx(/*!#*/"Organization: ");
+      li.tx(context.formatMessage(RenderingContext.PAT_ORG));
       render(r, li, organization);
     }
     if (period != null) {
       li = ul.li();
-      li.tx(/*!#*/"Valid Period: ");
+      li.tx(context.formatMessage(RenderingContext.PAT_PERIOD));
       render(r, li, period);
     }
   }
@@ -624,18 +622,16 @@ public class PatientRenderer extends ResourceRenderer {
     };
     if (names.size() == 1) {
       XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Alt. Name:", /*!#*/"Alternate names (see the one above)");
+      nameCell(tr, context.formatMessage(RenderingContext.PAT_ALT_NAME), context.formatMessage(RenderingContext.PAT_ALT_NAME_HINT));
       XhtmlNode td = tr.td();
       td.colspan("3");
-      render(r, td, names.get(0));
-    } else if (names.size() > 1) {
-      XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Alt Names:", /*!#*/"Alternate names (see the one above)");
-      XhtmlNode td = tr.td();
-      td.colspan("3");
-      XhtmlNode ul = td.ul();
-      for (HumanName n : names) {
-        render(r, ul.li(), n);
+      if (names.size() == 1) {
+        render(r, td, names.get(0));
+      } else {
+        XhtmlNode ul = td.ul();
+        for (HumanName n : names) {
+          render(r, ul.li(), n);
+        }
       }
     }
   }
@@ -651,27 +647,25 @@ public class PatientRenderer extends ResourceRenderer {
     for (BaseWrapper t : pw.getValues()) {
       adds.add((Address) t.getBase());
     }
-    if (tels.size() + adds.size() == 1) {
+    if (tels.size() + adds.size() > 0) {
       XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Contact Detail:", /*!#*/"Ways to contact the Patient");
+      nameCell(tr, context.formatMessage(RenderingContext.PAT_CONTACT), context.formatMessage(RenderingContext.PAT_CONTACT_HINT));
       XhtmlNode td = tr.td();
       td.colspan("3");
-      if (adds.isEmpty()) {
-        render(r, td, tels.get(0));
+      if (tels.size() + adds.size() == 1) {
+        if (adds.isEmpty()) {
+          render(r, td, tels.get(0));
+        } else {
+          render(r, td, adds.get(0));
+        }
       } else {
-        render(r, td, adds.get(0));
-      }
-    } else if (tels.size() + adds.size() > 1) {
-      XhtmlNode tr = tbl.tr();
-      nameCell(tr, /*!#*/"Contact Details:", /*!#*/"Ways to contact the Patient");
-      XhtmlNode td = tr.td();
-      td.colspan("3");
-      XhtmlNode ul = td.ul();
-      for (ContactPoint n : tels) {
-        render(r, ul.li(), n);
-      }
-      for (Address n : adds) {
-        render(r, ul.li(), n);
+        XhtmlNode ul = td.ul();
+        for (ContactPoint n : tels) {
+          render(r, ul.li(), n);
+        }
+        for (Address n : adds) {
+          render(r, ul.li(), n);
+        }
       }
     }
   }
@@ -698,7 +692,7 @@ public class PatientRenderer extends ResourceRenderer {
         PropertyWrapper a = r.getChildByName("active");
         if (a.hasValues()) {
           pos++;
-          nameCell(tr, /*!#*/"Active:", /*!#*/"Record is active");
+          nameCell(tr, context.formatMessage(RenderingContext.PAT_ACTIVE), context.formatMessage(RenderingContext.PAT_ACTIVE_HINT));
           XhtmlNode td = tr.td();
           if (pos == count) {
             td.colspan("3");
@@ -710,7 +704,7 @@ public class PatientRenderer extends ResourceRenderer {
         PropertyWrapper a = r.getChildByName("deceased[x]");
         if (a.hasValues()) {
           pos++;
-          nameCell(tr, /*!#*/"Deceased:", /*!#*/"Known status of Patient");
+          nameCell(tr, context.formatMessage(RenderingContext.PAT_DECEASED), context.formatMessage(RenderingContext.PAT_DECEASED_HINT));
           XhtmlNode td = tr.td();
           if (pos == count) {
             td.colspan("3");
@@ -725,7 +719,7 @@ public class PatientRenderer extends ResourceRenderer {
           if (pos == 3) {
             tr = tbl.tr();          
           }
-          nameCell(tr, /*!#*/"Marital Status:", /*!#*/"Known Marital status of Patient");
+          nameCell(tr, context.formatMessage(RenderingContext.PAT_MARITAL), context.formatMessage(RenderingContext.PAT_MARITAL_HINT));
           XhtmlNode td = tr.td();
           if (pos == count) {
             td.colspan("3");
@@ -740,7 +734,7 @@ public class PatientRenderer extends ResourceRenderer {
           if (pos == 3) {
             tr = tbl.tr();          
           }
-          nameCell(tr, /*!#*/"Multiple Birth:", /*!#*/"Known multipleBirth status of Patient");
+          nameCell(tr, context.formatMessage(RenderingContext.PAT_MUL_BIRTH), context.formatMessage(RenderingContext.PAT_MUL_BIRTH_HINT));
           XhtmlNode td = tr.td();
           if (pos == count) {
             td.colspan("3");
@@ -783,7 +777,7 @@ public class PatientRenderer extends ResourceRenderer {
             String n = UUID.randomUUID().toString().toLowerCase()+ext;
             TextFile.bytesToFile(att.getData(), new File(Utilities.path(context.getDestDir(), n)));
             context.registerFile(n);
-            td.img(n, /*!#*/"patient photo");            
+            td.img(n, context.formatMessage(RenderingContext.PAT_PHOTO));            
           }
           return;
         } 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
index 684833bfb..d46a0b61b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
@@ -525,7 +525,7 @@ public abstract class ResourceRenderer extends DataRenderer {
 
   protected void generateCopyright(XhtmlNode x, CanonicalResource cs) {
     XhtmlNode p = x.para();
-    p.b().tx(getContext().formatMessage(RenderingContext.RENDER_RESOURCE_COPYRIGHT));
+    p.b().tx(getContext().formatMessage(RenderingContext.RESOURCE_COPYRIGHT));
     smartAddText(p, " " + cs.getCopyright());
   }
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/StructureMapRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/StructureMapRenderer.java
index 829034c61..fae63e3b2 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/StructureMapRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/StructureMapRenderer.java
@@ -59,7 +59,7 @@ public class StructureMapRenderer extends TerminologyRenderer {
   private static final String COLOR_CONST = "blue";
   private static final String COLOR_VARIABLE = "maroon";
   private static final String COLOR_SYNTAX = "navy";
-  private static final boolean RENDER_MULTIPLE_TARGETS_ONELINE = true;
+  private static final boolean MULTIPLE_TARGETS_ONELINE = true;
   private static final String COLOR_SPECIAL = "#b36b00";
   private static final String DEFAULT_COMMENT = /*!#*/"This element was not defined prior to R5";
   
@@ -382,7 +382,7 @@ public class StructureMapRenderer extends TerminologyRenderer {
           first = false;
         else
           x.color(COLOR_SYNTAX).tx(", ");
-        if (RENDER_MULTIPLE_TARGETS_ONELINE)
+        if (MULTIPLE_TARGETS_ONELINE)
           x.tx(" ");
         else {
           x.tx("\r\n");
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java
index 7f994273e..e3392e4eb 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java
@@ -211,21 +211,21 @@ public abstract class TerminologyRenderer extends ResourceRenderer {
     if (hasHierarchy) {
       tr.td().b().tx(/*!#*/"Lvl");
     }
-    tr.td().attribute("style", "white-space:nowrap").b().tx(formatMessage(RenderingContext.RENDER_TX_CODE));
+    tr.td().attribute("style", "white-space:nowrap").b().tx(formatMessage(RenderingContext.TX_CODE));
     if (hasDisplay) {
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_TX_DISPLAY));
+      tr.td().b().tx(formatMessage(RenderingContext.TX_DISPLAY));
     }
     if (definitions) {
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_TX_DEFINITION));
+      tr.td().b().tx(formatMessage(RenderingContext.TX_DEFINITION));
     }
     if (deprecated) {
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_TX_DEPRECATED));
+      tr.td().b().tx(formatMessage(RenderingContext.TX_DEPRECATED));
     }
     if (comments) {
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_TX_COMMENTS));
+      tr.td().b().tx(formatMessage(RenderingContext.TX_COMMENTS));
     }
     if (version) {
-      tr.td().b().tx(formatMessage(RenderingContext.RENDER_TX_VERSION));
+      tr.td().b().tx(formatMessage(RenderingContext.TX_VERSION));
     }
     if (properties != null) {
       for (PropertyComponent pc : properties) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
index 2a465c95a..ebd46c4ce 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
@@ -1,6 +1,7 @@
 package org.hl7.fhir.r5.renderers.utils;
 
 import java.io.IOException;
+import java.text.NumberFormat;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -18,7 +19,10 @@ import org.hl7.fhir.r5.elementmodel.Element;
 import org.hl7.fhir.r5.fhirpath.FHIRPathEngine.IEvaluationContext;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.DomainResource;
+import org.hl7.fhir.r5.model.Extension;
+import org.hl7.fhir.r5.model.PrimitiveType;
 import org.hl7.fhir.r5.renderers.utils.Resolver.IReferenceResolver;
+import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.utilities.FhirPublication;
 import org.hl7.fhir.utilities.MarkDownProcessor;
 import org.hl7.fhir.utilities.MarkDownProcessor.Dialect;
@@ -166,7 +170,7 @@ public class RenderingContext extends RenderingI18nContext {
       return this == XML_ALL || this == XML;
     }
   }
-  
+
   private IWorkerContext worker;
   private MarkDownProcessor markdown;
   private ResourceRendererMode mode;
@@ -745,5 +749,18 @@ public class RenderingContext extends RenderingI18nContext {
     return typeMap;
   }
 
+  public String getTranslated(PrimitiveType<?> t) {
+    String v = ToolingExtensions.getLanguageTranslation(t, lang);
+    if (v != null) {
+      return v;
+    }
+    return t.asStringValue();
+  }
+
+  public String toStr(int v) {
+    NumberFormat nf = NumberFormat.getInstance(locale);
+    return nf.format(v);
+  }
+
   
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
index 6b35dc6a7..116ed58ed 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
@@ -793,7 +793,7 @@ public class ToolingExtensions {
       if (e.getUrl().equals(EXT_TRANSLATION)) {
         Extension e1 = ExtensionHelper.getExtension(e, "lang");
 
-        if (e1 != null && e1.getValue() instanceof CodeType && ((CodeType) e.getValue()).getValue().equals(lang)) {
+        if (e1 != null && e1.getValue() != null && e1.getValue() instanceof CodeType && ((CodeType) e1.getValue()).getValue().equals(lang)) {
           e1 = ExtensionHelper.getExtension(e, "content");
           return ((StringType) e.getValue()).getValue();
         }
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
index 12e5b7eef..b303e6e51 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
@@ -99,7 +99,7 @@ public class StructureMapUtilities {
   public static final String MAP_WHERE_EXPRESSION = "map.where.expression";
   public static final String MAP_SEARCH_EXPRESSION = "map.search.expression";
   public static final String MAP_EXPRESSION = "map.transform.expression";
-  private static final boolean RENDER_MULTIPLE_TARGETS_ONELINE = true;
+  private static final boolean MULTIPLE_TARGETS_ONELINE = true;
   public static final String AUTO_VAR_NAME = "vvv";
   public static final String DEF_GROUP_NAME = "DefaultMappingGroupAnonymousAlias";
   
@@ -364,7 +364,7 @@ public class StructureMapUtilities {
           first = false;
         else
           b.append(", ");
-        if (RENDER_MULTIPLE_TARGETS_ONELINE)
+        if (MULTIPLE_TARGETS_ONELINE)
           b.append(' ');
         else {
           b.append("\r\n");
diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json
index d01076756..f728ed045 100644
--- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json
+++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json
@@ -1,4 +1,6 @@
 {
+  "http://example.org/fhir/example2" : null,
+  "http://example.org/fhir/example1" : null,
   "http://somewhere/something-else" : null,
   "http://loinc.org/vs/LL715-4" : null,
   "http://hl7.org/fhir/us/vrdr/ValueSet/vrdr-PlaceOfDeath" : null,
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
index 2364dce33..a63035f0c 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java
@@ -906,11 +906,6 @@ public class I18nConstants {
   public static final String SD_OBGLIGATION_INHERITS_PROFILE_NOT_RIGHT_TYPE = "SD_OBGLIGATION_INHERITS_PROFILE_NOT_RIGHT_TYPE";
   public static final String SD_OBGLIGATION_INHERITS_PROFILE_NOT_RIGHT_BASE = "SD_OBGLIGATION_INHERITS_PROFILE_NOT_RIGHT_BASE";
 
-  public static final String RND_CS_CONTENT_COMPLETE = "RND_CS_CONTENT_COMPLETE";
-  public static final String RND_CS_CONTENT_EXAMPLE = "RND_CS_CONTENT_EXAMPLE";
-  public static final String RND_CS_CONTENT_FRAGMENT = "RND_CS_CONTENT_FRAGMENT";
-  public static final String RND_CS_CONTENT_NOTPRESENT = "RND_CS_CONTENT_NOTPRESENT";
-  public static final String RND_CS_CONTENT_SUPPLEMENT = "RND_CS_CONTENT_SUPPLEMENT";
   public static final String QUESTIONNAIRE_Q_UNKNOWN_DERIVATION = "QUESTIONNAIRE_Q_UNKNOWN_DERIVATION";
   public static final String QUESTIONNAIRE_Q_NO_DERIVATION_TYPE = "QUESTIONNAIRE_Q_NO_DERIVATION_TYPE";
   public static final String QUESTIONNAIRE_Q_NO_DERIVATION_TYPE_VALUE = "QUESTIONNAIRE_Q_NO_DERIVATION_TYPE_VALUE";
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java
index ec09832cf..014f9a74f 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java
@@ -1,98 +1,145 @@
 package org.hl7.fhir.utilities.i18n;
 
 public class RenderingI18nContext extends I18nBase {
-
-  public static final String RENDER_BUNDLE_HEADER_ROOT = "RENDER_BUNDLE_HEADER_ROOT";
-  public static final String RENDER_BUNDLE_HEADER_ENTRY = "RENDER_BUNDLE_HEADER_ENTRY";
-  public static final String RENDER_BUNDLE_HEADER_ENTRY_URL = "RENDER_BUNDLE_HEADER_ENTRY_URL";
-  public static final String RENDER_BUNDLE_RESOURCE = "RENDER_BUNDLE_RESOURCE";
-  public static final String RENDER_BUNDLE_SEARCH = "RENDER_BUNDLE_SEARCH";
-  public static final String RENDER_BUNDLE_SEARCH_MODE = "RENDER_BUNDLE_SEARCH_MODE"; 
-  public static final String RENDER_BUNDLE_SEARCH_SCORE = "RENDER_BUNDLE_SEARCH_SCORE";
-  public static final String RENDER_BUNDLE_RESPONSE = "RENDER_BUNDLE_RESPONSE";
-  public static final String RENDER_BUNDLE_LOCATION = "RENDER_BUNDLE_LOCATION";
-  public static final String RENDER_BUNDLE_ETAG = "RENDER_BUNDLE_ETAG";
-  public static final String RENDER_BUNDLE_LAST_MOD = "RENDER_BUNDLE_LAST_MOD";
-  public static final String RENDER_BUNDLE_REQUEST = "RENDER_BUNDLE_REQUEST";
-  public static final String RENDER_BUNDLE_IF_NON_MATCH = "RENDER_BUNDLE_IF_NON_MATCH";
-  public static final String RENDER_BUNDLE_IF_MOD = "RENDER_BUNDLE_IF_MOD";
-  public static final String RENDER_BUNDLE_IF_MATCH = "RENDER_BUNDLE_IF_MATCH";
-  public static final String RENDER_BUNDLE_IF_NONE = "RENDER_BUNDLE_IF_NONE";
-  public static final String RENDER_BUNDLE_DOCUMENT_CONTENT = "RENDER_BUNDLE_DOCUMENT_CONTENT";
-  public static final String RENDER_BUNDLE_HEADER_DOC_ENTRY_URD = "RENDER_BUNDLE_HEADER_DOC_ENTRY_URD";
-  public static final String RENDER_BUNDLE_HEADER_DOC_ENTRY_U = "RENDER_BUNDLE_HEADER_DOC_ENTRY_U";
-  public static final String RENDER_BUNDLE_HEADER_DOC_ENTRY_RD = "RENDER_BUNDLE_HEADER_DOC_ENTRY_RD";
-
-  public static final String SD_HEAD_NAME = "SD_HEAD_NAME";
-  public static final String SD_HEAD_NAME_DESC = "SD_HEAD_NAME_DESC";
-  public static final String SD_HEAD_FLAGS = "SD_HEAD_FLAGS";
-  public static final String SD_HEAD_FLAGS_DESC = "SD_HEAD_FLAGS_DESC";
-  public static final String SD_HEAD_CARD = "SD_HEAD_CARD";
-  public static final String SD_HEAD_CARD_DESC = "SD_HEAD_CARD_DESC";
-  public static final String SD_HEAD_TYPE = "SD_HEAD_TYPE";
-  public static final String SD_HEAD_TYPE_DESC = "SD_HEAD_TYPE_DESC";
-  public static final String SD_HEAD_DESC = "SD_HEAD_DESC";
-  public static final String SD_HEAD_DESC_DESC = "SD_HEAD_DESC_DESC";
-
-  public static final String SD_COMP_HEAD_NAME = "SD_COMP_HEAD_NAME";
-  public static final String SD_COMP_HEAD_NAME_DESC = "SD_COMP_HEAD_NAME_DESC";
-  public static final String SD_COMP_HEAD_FLAGS_L = "SD_COMP_HEAD_FLAGS_L";
-  public static final String SD_COMP_HEAD_FLAGS_L_DESC  ="SD_COMP_HEAD_FLAGS_L_DESC";
+  public static final String BUNDLE_DOCUMENT_CONTENT = "BUNDLE_DOCUMENT_CONTENT";
+  public static final String BUNDLE_ETAG = "BUNDLE_ETAG";
+  public static final String BUNDLE_HEADER_DOC_ENTRY_RD = "BUNDLE_HEADER_DOC_ENTRY_RD";
+  public static final String BUNDLE_HEADER_DOC_ENTRY_U = "BUNDLE_HEADER_DOC_ENTRY_U";
+  public static final String BUNDLE_HEADER_DOC_ENTRY_URD = "BUNDLE_HEADER_DOC_ENTRY_URD";
+  public static final String BUNDLE_HEADER_ENTRY = "BUNDLE_HEADER_ENTRY";
+  public static final String BUNDLE_HEADER_ENTRY_URL = "BUNDLE_HEADER_ENTRY_URL";
+  public static final String BUNDLE_HEADER_ROOT = "BUNDLE_HEADER_ROOT";
+  public static final String BUNDLE_IF_MATCH = "BUNDLE_IF_MATCH";
+  public static final String BUNDLE_IF_MOD = "BUNDLE_IF_MOD";
+  public static final String BUNDLE_IF_NONE = "BUNDLE_IF_NONE";
+  public static final String BUNDLE_IF_NON_MATCH = "BUNDLE_IF_NON_MATCH";
+  public static final String BUNDLE_LAST_MOD = "BUNDLE_LAST_MOD";
+  public static final String BUNDLE_LOCATION = "BUNDLE_LOCATION";
+  public static final String BUNDLE_REQUEST = "BUNDLE_REQUEST";
+  public static final String BUNDLE_RESOURCE = "BUNDLE_RESOURCE";
+  public static final String BUNDLE_RESPONSE = "BUNDLE_RESPONSE";
+  public static final String BUNDLE_SEARCH = "BUNDLE_SEARCH";
+  public static final String BUNDLE_SEARCH_MODE = "BUNDLE_SEARCH_MODE"; 
+  public static final String BUNDLE_SEARCH_SCORE = "BUNDLE_SEARCH_SCORE";
+  public static final String CODESYSTEM_CONCEPTS = "CODESYSTEM_CONCEPTS";
+  public static final String CODESYSTEM_DEPRECATED = "CODESYSTEM_DEPRECATED";
+  public static final String CODESYSTEM_FILTERS = "CODESYSTEM_FILTERS";
+  public static final String CODESYSTEM_FILTER_CODE = "CODESYSTEM_FILTER_CODE";
+  public static final String CODESYSTEM_FILTER_DESC = "CODESYSTEM_FILTER_DESC";
+  public static final String CODESYSTEM_FILTER_OP = "CODESYSTEM_FILTER_OP";
+  public static final String CODESYSTEM_FILTER_VALUE = "CODESYSTEM_FILTER_VALUE";
+  public static final String CODESYSTEM_PROPS = "CODESYSTEM_PROPS";
+  public static final String CODESYSTEM_PROPS_DESC = "CODESYSTEM_PROPS_DESC";
+  public static final String CODESYSTEM_PROP_CODE = "CODESYSTEM_PROP_CODE";
+  public static final String CODESYSTEM_PROP_DESC = "CODESYSTEM_PROP_DESC";
+  public static final String CODESYSTEM_PROP_NAME = "CODESYSTEM_PROP_NAME";
+  public static final String CODESYSTEM_PROP_TYPE = "CODESYSTEM_PROP_TYPE";
+  public static final String CODESYSTEM_PROP_URI = "CODESYSTEM_PROP_URI";
+  public static final String CODESYSTEM_CONTENT_COMPLETE = "CODESYSTEM_CONTENT_COMPLETE";
+  public static final String CODESYSTEM_CONTENT_EXAMPLE = "CODESYSTEM_CONTENT_EXAMPLE";
+  public static final String CODESYSTEM_CONTENT_FRAGMENT = "CODESYSTEM_CONTENT_FRAGMENT";
+  public static final String CODESYSTEM_CONTENT_NOTPRESENT = "CODESYSTEM_CONTENT_NOTPRESENT";
+  public static final String CODESYSTEM_CONTENT_SUPPLEMENT = "CODESYSTEM_CONTENT_SUPPLEMENT";
+  public static final String RESOURCE_COPYRIGHT = "RESOURCE_COPYRIGHT";
   public static final String SD_COMP_HEAD_CARD_L = "SD_COMP_HEAD_CARD_L";
   public static final String SD_COMP_HEAD_CARD_L_DESC  ="SD_COMP_HEAD_CARD_L_DESC";
-  public static final String SD_COMP_HEAD_TYPE_L = "SD_COMP_HEAD_TYPE_L";
-  public static final String SD_COMP_HEAD_TYPE_L_DESC  ="SD_COMP_HEAD_TYPE_L_DESC";
-  public static final String SD_COMP_HEAD_DESC_L = "SD_COMP_HEAD_DESC_L";
-  public static final String SD_COMP_HEAD_DESC_L_DESC  ="SD_COMP_HEAD_DESC_L_DESC";
-  public static final String SD_COMP_HEAD_FLAGS_R = "SD_COMP_HEAD_FLAGS_R";
-  public static final String SD_COMP_HEAD_FLAGS_R_DESC  ="SD_COMP_HEAD_FLAGS_R_DESC";
   public static final String SD_COMP_HEAD_CARD_R = "SD_COMP_HEAD_CARD_R";
   public static final String SD_COMP_HEAD_CARD_R_DESC  ="SD_COMP_HEAD_CARD_R_DESC";
-  public static final String SD_COMP_HEAD_TYPE_R = "SD_COMP_HEAD_TYPE_R";
-  public static final String SD_COMP_HEAD_TYPE_R_DESC  ="SD_COMP_HEAD_TYPE_R_DESC";
-  public static final String SD_COMP_HEAD_DESC_R = "SD_COMP_HEAD_DESC_R";
-  public static final String SD_COMP_HEAD_DESC_R_DESC  ="SD_COMP_HEAD_DESC_R_DESC";
   public static final String SD_COMP_HEAD_COMP = "SD_COMP_HEAD_COMP";
   public static final String SD_COMP_HEAD_COMP_DESC = "SD_COMP_HEAD_COMP_DESC";
-
-  public static final String SD_GRID_HEAD_NAME = "SD_GRID_HEAD_NAME";
-  public static final String SD_GRID_HEAD_NAME_DESC = "SD_GRID_HEAD_NAME_DESC";
+  public static final String SD_COMP_HEAD_DESC_L = "SD_COMP_HEAD_DESC_L";
+  public static final String SD_COMP_HEAD_DESC_L_DESC  ="SD_COMP_HEAD_DESC_L_DESC";
+  public static final String SD_COMP_HEAD_DESC_R = "SD_COMP_HEAD_DESC_R";
+  public static final String SD_COMP_HEAD_DESC_R_DESC  ="SD_COMP_HEAD_DESC_R_DESC";
+  public static final String SD_COMP_HEAD_FLAGS_L = "SD_COMP_HEAD_FLAGS_L";
+  public static final String SD_COMP_HEAD_FLAGS_L_DESC  ="SD_COMP_HEAD_FLAGS_L_DESC";
+  public static final String SD_COMP_HEAD_FLAGS_R = "SD_COMP_HEAD_FLAGS_R";
+  public static final String SD_COMP_HEAD_FLAGS_R_DESC  ="SD_COMP_HEAD_FLAGS_R_DESC";
+  public static final String SD_COMP_HEAD_NAME = "SD_COMP_HEAD_NAME";
+  public static final String SD_COMP_HEAD_NAME_DESC = "SD_COMP_HEAD_NAME_DESC";
+  public static final String SD_COMP_HEAD_TYPE_L = "SD_COMP_HEAD_TYPE_L";
+  public static final String SD_COMP_HEAD_TYPE_L_DESC  ="SD_COMP_HEAD_TYPE_L_DESC";
+  public static final String SD_COMP_HEAD_TYPE_R = "SD_COMP_HEAD_TYPE_R";
+  public static final String SD_COMP_HEAD_TYPE_R_DESC  ="SD_COMP_HEAD_TYPE_R_DESC";
+  public static final String SD_DOCO = "SD_DOCO";
   public static final String SD_GRID_HEAD_CARD = "SD_GRID_HEAD_CARD";
   public static final String SD_GRID_HEAD_CARD_DESC = "SD_GRID_HEAD_CARD_DESC";
-  public static final String SD_GRID_HEAD_TYPE = "SD_GRID_HEAD_TYPE";
-  public static final String SD_GRID_HEAD_TYPE_DESC = "SD_GRID_HEAD_TYPE_DESC";
   public static final String SD_GRID_HEAD_DESC = "SD_GRID_HEAD_DESC";
   public static final String SD_GRID_HEAD_DESC_DESC = "SD_GRID_HEAD_DESC_DESC";
-
+  public static final String SD_GRID_HEAD_NAME = "SD_GRID_HEAD_NAME";
+  public static final String SD_GRID_HEAD_NAME_DESC = "SD_GRID_HEAD_NAME_DESC";
+  public static final String SD_GRID_HEAD_TYPE = "SD_GRID_HEAD_TYPE";
+  public static final String SD_GRID_HEAD_TYPE_DESC = "SD_GRID_HEAD_TYPE_DESC";
+  public static final String SD_HEAD_CARD = "SD_HEAD_CARD";
+  public static final String SD_HEAD_CARD_DESC = "SD_HEAD_CARD_DESC";
+  public static final String SD_HEAD_DESC = "SD_HEAD_DESC";
+  public static final String SD_HEAD_DESC_DESC = "SD_HEAD_DESC_DESC";
+  public static final String SD_HEAD_FLAGS = "SD_HEAD_FLAGS";
+  public static final String SD_HEAD_FLAGS_DESC = "SD_HEAD_FLAGS_DESC";
+  public static final String SD_HEAD_NAME = "SD_HEAD_NAME";
+  public static final String SD_HEAD_NAME_DESC = "SD_HEAD_NAME_DESC";
+  public static final String SD_HEAD_TYPE = "SD_HEAD_TYPE";
+  public static final String SD_HEAD_TYPE_DESC = "SD_HEAD_TYPE_DESC";
   public static final String SD_LEGEND = "SD_LEGEND";
-  public static final String SD_DOCO = "SD_DOCO";
   public static final String SD_SLICING_INFO = "SD_SLICING_INFO";
-
-  public static final String RENDER_RESOURCE_COPYRIGHT = "RENDER_RESOURCE_COPYRIGHT";
+  public static final String SD_SUMMARY_MAPPINGS = "SD_SUMMARY_MAPPINGS";
+  public static final String SD_SUMMARY_MISSING_EXTENSION = "SD_SUMMARY_MISSING_EXTENSION";
+  public static final String SD_SUMMARY_MISSING_PROFILE = "SD_SUMMARY_MISSING_PROFILE";
+  public static final String SD_SUMMARY_PUBLICATION = "SD_SUMMARY_PUBLICATION";
+  public static final String SD_SUMMARY_SLICES = "SD_SUMMARY_SLICES";
+  public static final String SD_SUMMARY_SLICE = "SD_SUMMARY_SLICE";
+  public static final String SD_SUMMARY_SLICE_NONE = "SD_SUMMARY_SLICE_NONE";
+  public static final String SD_SUMMARY_MANDATORY = "SD_SUMMARY_MANDATORY";
+  public static final String SD_SUMMARY_MUST_SUPPORT = "SD_SUMMARY_MUST_SUPPORT";
+  public static final String SD_SUMMARY_FIXED = "SD_SUMMARY_FIXED";
+  public static final String SD_SUMMARY_INFO = "SD_SUMMARY_INFO";
+  public static final String SD_SUMMARY_PROHIBITED = "SD_SUMMARY_PROHIBITED";
+  public static final String SD_SUMMARY_NESTED_MANDATORY = "SD_SUMMARY_NESTED_MANDATORY";
+  public static final String TX_CODE = "TX_CODE";
+  public static final String TX_COMMENTS = "TX_COMMENTS";
+  public static final String TX_DEFINITION = "TX_DEFINITION";
+  public static final String TX_DEPRECATED = "TX_DEPRECATED";
+  public static final String TX_DISPLAY = "TX_DISPLAY";
+  public static final String TX_VERSION = "TX_VERSION";
+  public static final String PAT_GENDER = "PAT_GENDER";
+  public static final String PAT_NO_GENDER = "PAT_NO_GENDER";
+  public static final String PAT_NO_DOB = "PAT_NO_DOB";
+  public static final String PAT_DOB = "PAT_DOB";
+  public static final String PAT_NO_NAME = "PAT_NO_NAME";
+  public static final String PAT_CONTAINED = "PAT_CONTAINED";
+  public static final String PAT_OTHER_ID = "PAT_OTHER_ID";
+  public static final String PAT_OTHER_ID_HINT = "PAT_OTHER_ID_HINT";
+  public static final String PAT_LANG = "PAT_LANG";
+  public static final String PAT_LANG_HINT = "PAT_LANG_HINT";
+  public static final String PAT_LANG_PREFERRED = "PAT_LANG_PREFERRED";
+  public static final String PAT_GP = "PAT_GP";
+  public static final String PAT_MO = "PAT_MO";
+  public static final String PAT_LINKS = "PAT_LINKS";
+  public static final String PAT_LINKS_HINT = "PAT_LINKS_HINT";
+  public static final String PAT_LINK_REPLBY = "PAT_LINK_REPLBY";
+  public static final String PAT_LINK_REPL = "PAT_LINK_REPL";
+  public static final String PAT_LINK_REFER = "PAT_LINK_REFER";
+  public static final String PAT_LINK_SEE = "PAT_LINK_SEE";
+  public static final String PAT_NOM_CONTACT = "PAT_NOM_CONTACT";
+  public static final String PAT_NOK_CONTACT = "PAT_NOK_CONTACT";
+  public static final String PAT_NOK_CONTACT_HINT = "PAT_NOK_CONTACT_HINT";
+  public static final String PAT_RELN = "PAT_RELN";
+  public static final String PAT_ORG = "PAT_ORG";
+  public static final String PAT_PERIOD = "PAT_PERIOD";
+  public static final String PAT_ALT_NAME = "PAT_ALT_NAME";
+  public static final String PAT_ALT_NAME_HINT = "PAT_ALT_NAME_HINT";
+  public static final String PAT_CONTACT = "PAT_CONTACT";
+  public static final String PAT_CONTACT_HINT = "PAT_CONTACT_HINT";
+  public static final String PAT_ACTIVE = "PAT_ACTIVE";
+  public static final String PAT_ACTIVE_HINT = "PAT_ACTIVE_HINT";
+  public static final String PAT_DECEASED = "PAT_DECEASED";
+  public static final String PAT_DECEASED_HINT = "PAT_DECEASED_HINT";
+  public static final String PAT_MARITAL = "PAT_MARITAL";
+  public static final String PAT_MARITAL_HINT = "PAT_MARITAL_HINT";
+  public static final String PAT_MUL_BIRTH = "PAT_MUL_BIRTH";
+  public static final String PAT_MUL_BIRTH_HINT = "PAT_MUL_BIRTH_HINT";
+  public static final String PAT_PHOTO = "PAT_PHOTO";
   
-  public static final String RENDER_CODESYSTEM_FILTERS = "RENDER_CODESYSTEM_FILTERS";
-  public static final String RENDER_CODESYSTEM_FILTER_CODE = "RENDER_CODESYSTEM_FILTER_CODE";
-  public static final String RENDER_CODESYSTEM_FILTER_DESC = "RENDER_CODESYSTEM_FILTER_DESC";
-  public static final String RENDER_CODESYSTEM_FILTER_OP = "RENDER_CODESYSTEM_FILTER_OP";
-  public static final String RENDER_CODESYSTEM_FILTER_VALUE = "RENDER_CODESYSTEM_FILTER_VALUE";
-
-  public static final String RENDER_CODESYSTEM_PROPS = "RENDER_CODESYSTEM_PROPS";
-  public static final String RENDER_CODESYSTEM_PROPS_DESC = "RENDER_CODESYSTEM_PROPS_DESC";
-  public static final String RENDER_CODESYSTEM_PROP_NAME = "RENDER_CODESYSTEM_PROP_NAME";
-  public static final String RENDER_CODESYSTEM_PROP_CODE = "RENDER_CODESYSTEM_PROP_CODE";
-  public static final String RENDER_CODESYSTEM_PROP_URI = "RENDER_CODESYSTEM_PROP_URI";
-  public static final String RENDER_CODESYSTEM_PROP_TYPE = "RENDER_CODESYSTEM_PROP_TYPE";
-  public static final String RENDER_CODESYSTEM_PROP_DESC = "RENDER_CODESYSTEM_PROP_DESC";
-  public static final String RENDER_CODESYSTEM_CONCEPTS = "RENDER_CODESYSTEM_CONCEPTS";
-  public static final String RENDER_CODESYSTEM_DEPRECATED = "RENDER_CODESYSTEM_DEPRECATED";
-  
-
-  public static final String RENDER_TX_CODE = "RENDER_TX_CODE";
-  public static final String RENDER_TX_DISPLAY = "RENDER_TX_DISPLAY";
-  public static final String RENDER_TX_DEFINITION = "RENDER_TX_DEFINITION";
-  public static final String RENDER_TX_DEPRECATED = "RENDER_TX_DEPRECATED";
-  public static final String RENDER_TX_COMMENTS = "RENDER_TX_COMMENTS";
-  public static final String RENDER_TX_VERSION = "RENDER_TX_VERSION";
 
   protected String getMessagesSourceFileName() {
     return "rendering-phrases";
diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
index 856b8a843..bd4ab44bc 100644
--- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
@@ -1,84 +1,145 @@
 # Rendering
-RENDER_BUNDLE_HEADER_ROOT = Bundle {0} of type {1}
-RENDER_BUNDLE_HEADER_ENTRY = Entry {0}
-RENDER_BUNDLE_HEADER_ENTRY_URL = Entry {0} - fullUrl = {1}
-RENDER_BUNDLE_RESOURCE = Resource {0}:
-RENDER_BUNDLE_SEARCH = Search:
-RENDER_BUNDLE_SEARCH_MODE = Mode = {0}
-RENDER_BUNDLE_SEARCH_SCORE = Score = {0}
-RENDER_BUNDLE_RESPONSE = Response:
-RENDER_BUNDLE_LOCATION = Location = {0}
-RENDER_BUNDLE_ETAG = ETag = {0}
-RENDER_BUNDLE_LAST_MOD = LastModified = {0}
-RENDER_BUNDLE_REQUEST = Request:
-RENDER_BUNDLE_IF_NON_MATCH = If-None-Match = {0}
-RENDER_BUNDLE_IF_MOD = If-Modified-Since = {0}
-RENDER_BUNDLE_IF_MATCH = If-Match = {0}
-RENDER_BUNDLE_IF_NONE = If-None-Exist = {0}
-SD_HEAD_NAME = Name
-SD_HEAD_NAME_DESC = The logical name of the element
-SD_HEAD_FLAGS = Flags
-SD_HEAD_FLAGS_DESC = Information about the use of the element
-SD_HEAD_CARD = Card.
-SD_HEAD_CARD_DESC = Minimum and Maximum # of times the the element can appear in the instance
-SD_HEAD_TYPE = Type
-SD_HEAD_TYPE_DESC = Reference to the type of the element
-SD_HEAD_DESC = Description & Constraints
-SD_HEAD_DESC_DESC = Additional information about the element
-SD_COMP_HEAD_NAME = Name
-SD_COMP_HEAD_NAME_DESC = The logical name of the element
-SD_COMP_HEAD_FLAGS_L = L Flags
-SD_COMP_HEAD_FLAGS_L_DESC  = Information about the use of the element - Left Structure
+BUNDLE_HEADER_ROOT = Bundle {0} of type {1}
+BUNDLE_HEADER_ENTRY = Entry {0}
+BUNDLE_HEADER_ENTRY_URL = Entry {0} - fullUrl = {1}
+BUNDLE_RESOURCE = Resource {0}:
+BUNDLE_SEARCH = Search:
+BUNDLE_SEARCH_MODE = Mode = {0}
+BUNDLE_SEARCH_SCORE = Score = {0}
+BUNDLE_RESPONSE = Response:
+BUNDLE_LOCATION = Location = {0}
+BUNDLE_ETAG = ETag = {0}
+BUNDLE_LAST_MOD = LastModified = {0}
+BUNDLE_REQUEST = Request:
+BUNDLE_IF_NON_MATCH = If-None-Match = {0}
+BUNDLE_IF_MOD = If-Modified-Since = {0}
+BUNDLE_IF_MATCH = If-Match = {0}
+BUNDLE_IF_NONE = If-None-Exist = {0}
+CODEPROP_CODE = Code
+CODESYSTEM_PROPS = Properties
+CODESYSTEM_CONCEPTS = Concepts
+CODESYSTEM_DEPRECATED = Deprecated
+CODESYSTEM_DESC = Description
+CODESYSTEM_FILTERS = Filters
+CODESYSTEM_FILTER_CODE = Code
+CODESYSTEM_FILTER_OP = Op
+CODESYSTEM_FILTER_VALUE = Value
+CODESYSTEM_PROP_CODE = Code
+CODESYSTEM_PROP_NAME = Name
+CODESYSTEM_PROP_URI = URI
+CODESYSTEM_PROP_DESC = Description
+CODESYSTEM_PROP_TYPE = Type
+CODESYSTEM_PROPS_DESC = This code system defines the following properties for its concepts
+CODESYSTEM_CONTENT_COMPLETE This <param name="cased"/> code system <param name="cs"/> defines the following code<if test="code-count != 1">s</if><param name="h"/>:
+CODESYSTEM_CONTENT_EXAMPLE = This <param name="cased"/> code system <param name="cs"/> provides some code<if test="code-count != 1">s</if><param name="h"/> <b>that are example only</b>:
+CODESYSTEM_CONTENT_FRAGMENT =  This <param name="cased"/> code system <param name="cs"/> provides <b>a fragment</b> that includes following code<if test="code-count != 1">s</if><param name="h"/>:
+CODESYSTEM_CONTENT_NOTPRESENT = This <param name="cased"/> code system <param name="cs"/> defines codes<param name="h"/>, but no codes are represented here
+CODESYSTEM_CONTENT_SUPPLEMENT = This code system <param name="cs"/> defines {0} on the following code<if test="code-count != 1">s</if>:
+RESOURCE_COPYRIGHT = Copyright Statement:
 SD_COMP_HEAD_CARD_L = L Card.
 SD_COMP_HEAD_CARD_L_DESC  = Minimum and Maximum # of times the the element can appear in the instance - Left Structure
-SD_COMP_HEAD_TYPE_L = L Type
-SD_COMP_HEAD_TYPE_L_DESC  = Reference to the type of the element - Left Structure
-SD_COMP_HEAD_DESC_L = L Description & Constraints
-SD_COMP_HEAD_DESC_L_DESC  = Additional information about the element - Left Structure
-SD_COMP_HEAD_FLAGS_R = R Flags
-SD_COMP_HEAD_FLAGS_R_DESC  = Information about the use of the element - Right Structure
 SD_COMP_HEAD_CARD_R = R Card.
 SD_COMP_HEAD_CARD_R_DESC  = Minimum and Maximum # of times the the element can appear in the instance - Right Structure
-SD_COMP_HEAD_TYPE_R = R Type
-SD_COMP_HEAD_TYPE_R_DESC  = Reference to the type of the element - Right Structure
-SD_COMP_HEAD_DESC_R = R Description & Constraints
-SD_COMP_HEAD_DESC_R_DESC  = Additional information about the element - Right Structure
 SD_COMP_HEAD_COMP = Comments
 SD_COMP_HEAD_COMP_DESC = Comments about the comparison
-SD_GRID_HEAD_NAME = Name
-SD_GRID_HEAD_NAME_DESC = The name of the element (Slice name in brackets).  Mouse-over provides definition
+SD_COMP_HEAD_DESC_L = L Description & Constraints
+SD_COMP_HEAD_DESC_L_DESC  = Additional information about the element - Left Structure
+SD_COMP_HEAD_DESC_R = R Description & Constraints
+SD_COMP_HEAD_DESC_R_DESC  = Additional information about the element - Right Structure
+SD_COMP_HEAD_FLAGS_L = L Flags
+SD_COMP_HEAD_FLAGS_L_DESC  = Information about the use of the element - Left Structure
+SD_COMP_HEAD_FLAGS_R = R Flags
+SD_COMP_HEAD_FLAGS_R_DESC  = Information about the use of the element - Right Structure
+SD_COMP_HEAD_NAME = Name
+SD_COMP_HEAD_NAME_DESC = The logical name of the element
+SD_COMP_HEAD_TYPE_L = L Type
+SD_COMP_HEAD_TYPE_L_DESC  = Reference to the type of the element - Left Structure
+SD_COMP_HEAD_TYPE_R = R Type
+SD_COMP_HEAD_TYPE_R_DESC  = Reference to the type of the element - Right Structure
+SD_DOCO = Documentation for this format
 SD_GRID_HEAD_CARD = Card.
 SD_GRID_HEAD_CARD_DESC = Minimum and Maximum # of times the the element can appear in the instance. Super-scripts indicate additional constraints on appearance
-SD_GRID_HEAD_TYPE = Type
-SD_GRID_HEAD_TYPE_DESC = Reference to the type of the element
 SD_GRID_HEAD_DESC = Constraints and Usage
 SD_GRID_HEAD_DESC_DESC = Fixed values, length limits, vocabulary bindings and other usage notes
+SD_GRID_HEAD_NAME = Name
+SD_GRID_HEAD_NAME_DESC = The name of the element (Slice name in brackets).  Mouse-over provides definition
+SD_GRID_HEAD_TYPE = Type
+SD_GRID_HEAD_TYPE_DESC = Reference to the type of the element
+SD_HEAD_CARD = Card.
+SD_HEAD_CARD_DESC = Minimum and Maximum # of times the the element can appear in the instance
+SD_HEAD_DESC = Description & Constraints
+SD_HEAD_DESC_DESC = Additional information about the element
+SD_HEAD_FLAGS_DESC = Information about the use of the element
+SD_HEAD_NAME = Name
+SD_HEAD_SC = The logical name of the elemHEAD_FLAGS = Flags
+SD_HEAD_TYPE = Type
+SD_HEAD_TYPE_DESC = Reference to the type of the element
 SD_LEGEND = Legend for this format
-SD_DOCO = Documentation for this format
-RENDER_RESOURCE_COPYRIGHT = Copyright Statement:
-RENDER_CODESYSTEM_FILTERS = Filters
-RENDER_CODESYSTEM_FILTER_CODE = Code
-RENDER_CODESYSTEM_FILTER_DESC = Description
-RENDER_CODESYSTEM_FILTER_OP = Operator
-RENDER_CODESYSTEM_FILTER_VALUE = Value
-RENDER_CODESYSTEM_PROPS = Properties
-RENDER_CODESYSTEM_PROPS_DESC = This code system  defines the following properties for its concepts
-RENDER_CODESYSTEM_PROP_NAME = Name
-RENDER_CODESYSTEM_PROP_CODE = Code
-RENDER_CODESYSTEM_PROP_URI = URI
-RENDER_CODESYSTEM_PROP_TYPE = Type
-RENDER_CODESYSTEM_PROP_DESC = Description
-RND_CS_CONTENT_COMPLETE = This <param name="cased"/> code system <param name="cs"/> defines the following code<if test="code-count != 1">s</if><param name="h"/>:
-RND_CS_CONTENT_EXAMPLE = This <param name="cased"/> code system <param name="cs"/> provides some code<if test="code-count != 1">s</if><param name="h"/> <b>that are example only</b>:
-RND_CS_CONTENT_FRAGMENT =  This <param name="cased"/> code system <param name="cs"/> provides <b>a fragment</b> that includes following code<if test="code-count != 1">s</if><param name="h"/>:
-RND_CS_CONTENT_NOTPRESENT = This <param name="cased"/> code system <param name="cs"/> defines codes<param name="h"/>, but no codes are represented here
-RND_CS_CONTENT_SUPPLEMENT = This code system <param name="cs"/> defines {0} on the following code<if test="code-count != 1">s</if>:
-RENDER_CODESYSTEM_CONCEPTS = Concepts
-RENDER_CODESYSTEM_DEPRECATED = Deprecated
-RENDER_TX_CODE = Code
-RENDER_TX_DISPLAY = Display
-RENDER_TX_DEFINITION = Definition
-RENDER_TX_DEPRECATED = Deprecated
-RENDER_TX_COMMENTS = Comments
-RENDER_TX_VERSION = Version
-SD_SLICING_INFO = {0}, {1} by {2}
\ No newline at end of file
+SD_SUMMARY = Fixed Value: {0} {1}
+SD_SUMMARY_MAPPINGS = Mappings for {0} ({2}{1}{3})
+SD_SUMMARY_MISSING_EXTENSION = Unable to summarise extension {0} (no extension found)
+SD_SUMMARY_MISSING_PROFILE = Unable to summarise profile {0} (no profile found)
+SD_SUMMARY_PUBLICATION = This profile was published on {0} as a {1} by {2}
+SD_SUMMARY_SLICES = This structure defines the following {0}Slices{1}
+SD_SUMMARY_SLICE_NONE = There is a slice with no discriminator at {0}
+SD_SUMMARY_SLICE_one = The element {0} is sliced based on the value of {1}
+SD_SUMMARY_SLICE_other = The element {0} is sliced based on the values of {1}
+SD_SUMMARY_MANDATORY = Mandatory: {0} {1}
+SD_SUMMARY_MUST_SUPPORT = Must-Support: {0} {1}
+SD_SUMMARY_FIXED = Fixed: {0} {1}
+SD_SUMMARY_INFO = {0}, {1} by {2}
+SD_SUMMARY_PROHIBITED = Prohibited: {0} {1}
+SD_SUMMARY_NESTED_MANDATORY = ({0} nested mandatory {1})
+TX_CODE = Code
+TX_COMMENTS = Comments
+TX_DEFINITION = Definition
+TX_DEPRECATED = Deprecated
+TX_DISPLAY = Display
+TX_VERSION = Version
+PAT_NO_GENDER = (no stated gender)
+PAT_GENDER = Gender: {0}
+PAT_NO_DOB = DoB Unknown
+PAT_DOB = DoB: {0}
+PAT_NO_NAME = Anonymous Patient
+PAT_CONTAINED_one = Contained Resource
+PAT_CONTAINED_other = Contained Resources
+PAT_OTHER_ID_one = Other Id:
+PAT_OTHER_ID_other = Other Ids:
+PAT_OTHER_ID_HINT_one = Other Id (see the one above)
+PAT_OTHER_ID_HINT_other = Other Ids (see the one above)
+PAT_LANG_one = Language:
+PAT_LANG_other = Languages:
+PAT_LANG_HINT_one = Language spoken
+PAT_LANG_HINT_other = Languages spoken
+PAT_LANG_PREFERRED = (preferred)
+PAT_GP = General Practitioner
+PAT_MO = Managing Organization
+PAT_LINKS = Links:
+PAT_LINKS_HINT = Patient Links
+PAT_LINK_REPLBY = This record replaced by
+PAT_LINK_REPL = This record replaces
+PAT_LINK_REFER = Please refer to
+PAT_LINK_SEE = Also see
+PAT_NOM_CONTACT = Nominated Contact:
+PAT_NOK_CONTACT = Contact:
+PAT_NOK_CONTACT_HINT = Patient contact
+PAT_RELN = Relationships:
+PAT_ORG = Organization:
+PAT_PERIOD = Valid Period:
+PAT_ALT_NAME = Alt. Name:
+PAT_ALT_NAME_HINT = Alternate names (see the one above)
+PAT_CONTACT = Contact Detail
+PAT_CONTACT_HINT = Ways to contact the Patient
+PAT_ACTIVE = Active:
+PAT_ACTIVE_HINT = Record is active
+PAT_DECEASED = Deceased:
+PAT_DECEASED_HINT = Known status of Patient
+PAT_MARITAL = Marital Status:
+PAT_MARITAL_HINT = Known Marital status of Patient
+PAT_MUL_BIRTH = Multiple Birth:
+PAT_MUL_BIRTH_HINT = Known multipleBirth status of Patient
+PAT_PHOTO = Patient Photo
+SD_HEAD_NAME_DESC = The logical name of the element
+SD_HEAD_FLAGS = Flags
+SD_SLICING_INFO = {0}, {1} by {2}
+  
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_de.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_de.properties
index ff1da5ec5..6a6eb0c2c 100644
--- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_de.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_de.properties
@@ -1,17 +1,17 @@
 # Rendering
-RENDER_BUNDLE_HEADER_ROOT=Bundle {0} vom Typ {1}
-RENDER_BUNDLE_HEADER_ENTRY=Entry {0}
-RENDER_BUNDLE_HEADER_ENTRY_URL=Entry {0} - fullUrl = {1}
-RENDER_BUNDLE_RESOURCE=Ressource {0}:
-RENDER_BUNDLE_SEARCH=Suche:
-RENDER_BUNDLE_SEARCH_MODE=Mode = {0}
-RENDER_BUNDLE_SEARCH_SCORE=Score = {0}
-RENDER_BUNDLE_RESPONSE=Response:
-RENDER_BUNDLE_LOCATION=Location = {0}
-RENDER_BUNDLE_ETAG=ETag = {0}
-RENDER_BUNDLE_LAST_MOD=LastModified = {0}
-RENDER_BUNDLE_REQUEST=Request:
-RENDER_BUNDLE_IF_NON_MATCH=If-None-Match = {0}
-RENDER_BUNDLE_IF_MOD=If-Modified-Since = {0}
-RENDER_BUNDLE_IF_MATCH=If-Match = {0}
-RENDER_BUNDLE_IF_NONE=If-None-Exist = {0}
+BUNDLECH=If-Match = {0}
+BUNDLE_ENTRY=Entry {0}
+BUNDLE_ETAG=ETag = {0}
+BUNDLE_HEADER_RL=Entry {0} - fullUrl = {1}
+BUNDLE_IF_MODified-Since = {0}
+BUNDLE_IF_NH=If-None-Match = {0}
+BUNDLE_IF_NONE=If-None= {0}
+BUNDLE_LOCATION=Locatio
+BUNDLE_MODE=Mode = {0}
+BUNDLE_RESOURCE=Resso}:
+BUNDLE_RESesponse:
+BUNDLE_SEARCH=Suche:
+BUNDLH_SCORE=Score = {0}
+BUNDLST=Request:
+BUST_MOD=LastModified = {0}
+HEADER_ROOT=Bundle {0} vom Typ {1}
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_es.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_es.properties
index 8990e718f..fc4416786 100644
--- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_es.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_es.properties
@@ -1,17 +1,16 @@
 # Rendering
-RENDER_BUNDLE_HEADER_ROOT = Bundle {0} De tipo {1}
-RENDER_BUNDLE_HEADER_ENTRY = Entry {0}
-RENDER_BUNDLE_HEADER_ENTRY_URL = Entry {0} - FullURL = {1}
-RENDER_BUNDLE_RESOURCE = Recurso {0}:
-RENDER_BUNDLE_SEARCH = Búsqueda:
-RENDER_BUNDLE_SEARCH_MODE = mode = {0}
-RENDER_BUNDLE_SEARCH_SCORE = score = {0}
-RENDER_BUNDLE_RESPONSE = Respuesta:
-RENDER_BUNDLE_LOCATION = Location = {0}
-RENDER_BUNDLE_ETAG = ETag = {0}
-RENDER_BUNDLE_LAST_MOD = LastModified = {0}
-RENDER_BUNDLE_REQUEST = Request:
-RENDER_BUNDLE_IF_NON_MATCH = If-None-Match = {0}
-RENDER_BUNDLE_IF_MOD = If-Modified-Since = {0}
-RENDER_BUNDLE_IF_MATCH = If-Match = {0}
-RENDER_BUNDLE_IF_NONE = If-None-Exist = {0}
+BEARCH_MODE = mode = {0}
+BEQUEST = Request:
+BUNDLE_ENTRY = Entry {0}
+BUNDLE_ETAG = ETag = {0E_LAST_MOD = LastModified = {0}
+BUNDLE_HEADER_RL = Entry {0} - FullURL = {1}
+BUNDLE_IFIf-Modified-Since = {0}
+BUNDLE_IF_NONE = IExist = {0}
+BUNDLE_LOCATION = Lo= {0}
+BUNDLE_MATCH = If-None-Match = {0}
+BUNDLE_R = Respuesta:
+BUNDLE_RESOURCE = Rec}:
+BUNDLE_SEARCH = Búsqueda:
+BUNRCH_SCORE = score = {0}
+BU_MATCH = If-Match = {0}
+HEADER_ROOT = Bundle {0} De tipo {1}
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_ja.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_ja.properties
index 36fd58921..aab1e3002 100644
--- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_ja.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_ja.properties
@@ -1,22 +1,22 @@
 # Rendering
-RENDER_BUNDLE_HEADER_ROOT  = タイプ {1} のバンドル {0}
-RENDER_BUNDLE_HEADER_ENTRY  = エントリ {0}
-RENDER_BUNDLE_HEADER_ENTRY_URL  = エントリ {0} - fullUrl = {1}
-RENDER_BUNDLE_RESOURCE  =  Resource {0}:
-RENDER_BUNDLE_SEARCH  =  Search:
-RENDER_BUNDLE_SEARCH_MODE  =  Mode = {0}
-RENDER_BUNDLE_SEARCH_SCORE  =  Score = {0}
-RENDER_BUNDLE_RESPONSE  =  Response:
-RENDER_BUNDLE_LOCATION  = Location = {0}
-RENDER_BUNDLE_ETAG  = ETag = {0}
-RENDER_BUNDLE_LAST_MOD  = LastModified = {0}
-RENDER_BUNDLE_REQUEST  =  Request:
-RENDER_BUNDLE_IF_NON_MATCH  = If-None-Match = {0}
-RENDER_BUNDLE_IF_MOD  = If-Modified-Since = {0}
-RENDER_BUNDLE_IF_MATCH  = If-Match = {0}
-RENDER_BUNDLE_IF_NONE  = If-None-Exist = {0}
-RND_CS_CONTENT_COMPLETE  = この<param name="cased"/>コードシステム <param name="cs"/> は次のコード<if test="code-count != 1">たち</if><param name="h"/>を定義します:
-RND_CS_CONTENT_EXAMPLE  = この<param name="cased"/>コードシステム <param name="cs"/> はいくつかの例コード<if test="code-count != 1">たち</if><param name="h"/>を提供します:
-RND_CS_CONTENT_FRAGMENT  = この<param name="cased"/>コードシステム <param name="cs"/> は以下のコード<param name="h"/>を含むフラグメントを提供します:
-RND_CS_CONTENT_NOTPRESENT  = このコードシステム <param name="cs"/> はコード<param name="h"/>を定義しますが、ここではコードは表現されていません
-RND_CS_CONTENT_SUPPLEMENT  = このコードシステム <param name="cs"/> は次のコードに {0} を定義します:
+BUNDLE_ETAG  = ETag = {0}
+BUNDLE_HEADER_ENTRY  = エントリ {0}
+BUNDLE_HEADER_ENTRY_URL  = エントリ {0} - fullUrl = {1}
+BUNDLE_HEADER_ROOT  = タイプ {1} のバンドル {0}
+BUNDLE_IF_MATCH  = If-Match = {0}
+BUNDLE_IF_MOD  = If-Modified-Since = {0}
+BUNDLE_IF_NONE  = If-None-Exist = {0}
+BUNDLE_IF_NON_MATCH  = If-None-Match = {0}
+BUNDLE_LAST_MOD  = LastModified = {0}
+BUNDLE_LOCATION  = Location = {0}
+BUNDLE_REQUEST  =  Request:
+BUNDLE_RESOURCE  =  Resource {0}:
+BUNDLE_RESPONSE  =  Response:
+BUNDLE_SEARCH  =  Search:
+BUNDLE_SEARCH_MODE  =  Mode = {0}
+BUNDLE_SEARCH_SCORE  =  Score = {0}
+CODESYSTEM_CONTENT_COMPLETE  = この<param name="cased"/>コードシステム <param name="cs"/> は次のコード<if test="code-count != 1">たち</if><param name="h"/>を定義します:
+CODESYSTEM_CONTENT_EXAMPLE  = この<param name="cased"/>コードシステム <param name="cs"/> はいくつかの例コード<if test="code-count != 1">たち</if><param name="h"/>を提供します:
+CODESYSTEM_CONTENT_FRAGMENT  = この<param name="cased"/>コードシステム <param name="cs"/> は以下のコード<param name="h"/>を含むフラグメントを提供します:
+CODESYSTEM_CONTENT_NOTPRESENT  = このコードシステム <param name="cs"/> はコード<param name="h"/>を定義しますが、ここではコードは表現されていません
+CODESYSTEM_CONTENT_SUPPLEMENT  = このコードシステム <param name="cs"/> は次のコードに {0} を定義します:
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_nl.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_nl.properties
index c219a1de4..3c6dd5352 100644
--- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_nl.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases_nl.properties
@@ -1,17 +1,17 @@
 # Rendering
-RENDER_BUNDLE_HEADER_ROOT = Bundle {0} van type {1}
-RENDER_BUNDLE_HEADER_ENTRY = Entry {0}
-RENDER_BUNDLE_HEADER_ENTRY_URL = Entry {0} - Full URL = {1}
-RENDER_BUNDLE_RESOURCE = Resource {0}:
-RENDER_BUNDLE_SEARCH = Zoeken:
-RENDER_BUNDLE_SEARCH_MODE = mode = {0} 
-RENDER_BUNDLE_SEARCH_SCORE = score = {0}
-RENDER_BUNDLE_RESPONSE = Response:
-RENDER_BUNDLE_LOCATION = Location = {0}
-RENDER_BUNDLE_ETAG = ETag = {0}
-RENDER_BUNDLE_LAST_MOD = LastModified = {0}
-RENDER_BUNDLE_REQUEST = Request:
-RENDER_BUNDLE_IF_NON_MATCH = If-None-Match = {0}
-RENDER_BUNDLE_IF_MOD = If-Modified-Since = {0}
-RENDER_BUNDLE_IF_MATCH = If-Match = {0}
-RENDER_BUNDLE_IF_NONE = If-None-Exist = {0}
+BUNDLE_ETAG = ETag = {0}
+BUNDLE_HEADER_ENTRY = Entry {0}
+BUNDLE_HEADER_ENTRY_URL = Entry {0} - Full URL = {1}
+BUNDLE_HEADER_ROOT = Bundle {0} van type {1}
+BUNDLE_IF_MATCH = If-Match = {0}
+BUNDLE_IF_MOD = If-Modified-Since = {0}
+BUNDLE_IF_NONE = If-None-Exist = {0}
+BUNDLE_IF_NON_MATCH = If-None-Match = {0}
+BUNDLE_LAST_MOD = LastModified = {0}
+BUNDLE_LOCATION = Location = {0}
+BUNDLE_REQUEST = Request:
+BUNDLE_RESOURCE = Resource {0}:
+BUNDLE_RESPONSE = Response:
+BUNDLE_SEARCH = Zoeken:
+BUNDLE_SEARCH_MODE = mode = {0} 
+BUNDLE_SEARCH_SCORE = score = {0}
\ No newline at end of file