diff --git a/demos.html b/demos.html
index accbfb6b9..29ad6b51c 100644
--- a/demos.html
+++ b/demos.html
@@ -70,7 +70,7 @@ <h1>LForms Demos</h1>
     Click on the "JavaScript" tab to view this form's definition.  This form
 only defines the question "Eye color".
     <div>
-      <a class="showSource" _src="lforms/rxmdh3jq/31">[Show Demo]</a>
+      <a class="showSource" _src="lforms/rxmdh3jq/34">[Show Demo]</a>
     </div>
   </li>
 
@@ -79,7 +79,7 @@ <h1>LForms Demos</h1>
 answer lists.  In FHIR, list questions can either be of type "choice" (which limits
 answers to the list, or "open-choice", which allows entry of off-list answers).
     <div>
-      <a class="showSource" _src="lforms/v0uo9kam/20">[Show Demo]</a>
+      <a class="showSource" _src="lforms/v0uo9kam/23">[Show Demo]</a>
     </div>
   </li>
 
@@ -87,7 +87,7 @@ <h1>LForms Demos</h1>
     <span class="demoTitle">Date fields &amp; fields with units</span>: Questions
 can also be date fields with a calendar input, or be numeric fields with units.
     <div>
-      <a class="showSource" _src="lforms/90so0gxg/18">[Show Demo]</a>
+      <a class="showSource" _src="lforms/90so0gxg/21">[Show Demo]</a>
     </div>
   </li>
 
@@ -97,7 +97,7 @@ <h1>LForms Demos</h1>
 specified via a URL for an external FHIR ValueSet, and the field will show matches as the user
 types.
     <div>
-      <a class="showSource" _src="lforms/83of00cj/23">[Show Demo]</a>
+      <a class="showSource" _src="lforms/83of00cj/27">[Show Demo]</a>
     </div>
   </li>
 
@@ -106,7 +106,7 @@ <h1>LForms Demos</h1>
 labeled sections and sections can have sub-sections.  A "repeats" flag can be
 set on sections (or questions) to make them repeat.
     <div>
-      <a class="showSource" _src="lforms/d3y6pc1r/16">[Show Demo]</a>
+      <a class="showSource" _src="lforms/d3y6pc1r/20">[Show Demo]</a>
     </div>
   </li>
 
@@ -116,7 +116,7 @@ <h1>LForms Demos</h1>
 href="https://hl7.org/fhir/uv/sdc/rendering.html#itemControl">itemControl</a> extension
 and setting a value of "gtable".
     <div>
-      <a class="showSource" _src="lforms/4m7o1L7k/17">[Show Demo]</a>
+      <a class="showSource" _src="lforms/4m7o1L7k/19">[Show Demo]</a>
     </div>
   </li>
 
@@ -125,7 +125,7 @@ <h1>LForms Demos</h1>
 text, which by default is shown when the user clicks on the help button next to
 the question.
     <div>
-      <a class="showSource" _src="lforms/6d5rhvn1/17">[Show Demo]</a>
+      <a class="showSource" _src="lforms/6d5rhvn1/20">[Show Demo]</a>
     </div>
   </li>
 
@@ -137,7 +137,7 @@ <h1>LForms Demos</h1>
 from the other ("source") field is met.  In the example below, try picking
 "Green" for "Favorite color".
     <div>
-      <a class="showSource" _src="lforms/3apezk07/14">[Show Demo]</a>
+      <a class="showSource" _src="lforms/3apezk07/16">[Show Demo]</a>
     </div>
   </li>
 
@@ -148,7 +148,7 @@ <h1>LForms Demos</h1>
 to pick from, when "repeats" is set to true a button will appear which allows
 the user to add more blanks for that question.
     <div>
-      <a class="showSource" _src="lforms/sdted75w/31">[Show Demo]</a>
+      <a class="showSource" _src="lforms/sdted75w/34">[Show Demo]</a>
     </div>
   </li>
 
@@ -160,7 +160,7 @@ <h1>LForms Demos</h1>
 Service</a>) and one that obtains its list of strengths from the data associated
 with the selected drug name.
     <div>
-      <a class="showSource" _src="lforms/ccbr6nos/21">[Show Demo]</a>
+      <a class="showSource" _src="lforms/ccbr6nos/23">[Show Demo]</a>
     </div>
   </li>
 
@@ -174,7 +174,7 @@ <h1>LForms Demos</h1>
 can also be obtained as FHIR Questionnaires from the <a
 href="https://loinc.org/fhir/">LOINC terminology server</a>.
     <div>
-      <a class="showSource" _src="lforms/weaqqbg4/39">[Show Demo]</a>
+      <a class="showSource" _src="lforms/weaqqbg4/41">[Show Demo]</a>
     </div>
   </li>
 
@@ -185,13 +185,13 @@ <h1>LForms Demos</h1>
     definition.  After filling in the field,
     click the button to see the FHIR QuestionnaireResponse output.
     <div>
-      <a class="showSource" _src="lforms/8f754jhy/44">[Show Demo]</a>
+      <a class="showSource" _src="lforms/8f754jhy/54">[Show Demo]</a>
     </div>
     FHIR QuestionnaireResponse data can be merged with a FHIR Questionnaire to
     show a form with data from the QuestionnaireResponse.  The following example shows
     how do to that.
     <div>
-      <a class="showSource" _src="lforms/y8o65qwe/22">[Show Demo]</a>
+      <a class="showSource" _src="lforms/y8o65qwe/26">[Show Demo]</a>
     </div>
   </li>
 
diff --git a/index.html b/index.html
index cea4e230f..b640dbeb6 100644
--- a/index.html
+++ b/index.html
@@ -180,18 +180,18 @@ <h2>
 
 <p>LHC-Forms can be used either as a prebuilt package or installed using
 <a href="https://www.npmjs.com/">npm</a> (<code>npm
-install lforms</code>, but see the note <a href="#npmInstall">below</a> about the
+install lforms</code>), but see the note <a href="#npmInstall">below</a> about the
 npm installation).  If you aren't using npm, the simplest way to start using
 LHC-Forms is by linking to the prebuilt version hosted on
-clinicaltables.nlm.nih.gov.  The URLs for the CSS and JavaScript are:
+lhcforms-static.nlm.nih.gov.  The URLs for the CSS and JavaScript are:
 </p>
 <dl>
-  <dt>CSS</dt><dd>https://clinicaltables.nlm.nih.gov/lforms-versions/34.0.0/webcomponent/styles.css</dd>
+  <dt>CSS</dt><dd>https://lhcforms-static.nlm.nih.gov/lforms-versions/34.0.0/webcomponent/styles.css</dd>
   <dt>JavaScript</dt>
   <dd>
     <ol style="padding-left: 0">
-      <li>https://clinicaltables.nlm.nih.gov/lforms-versions/34.0.0/webcomponent/assets/lib/zone.min.js</li>
-      <li>https://clinicaltables.nlm.nih.gov/lforms-versions/34.0.0/webcomponent/lhc-forms.js</li>
+      <li>https://lhcforms-static.nlm.nih.gov/lforms-versions/34.0.0/webcomponent/assets/lib/zone.min.js</li>
+      <li>https://lhcforms-static.nlm.nih.gov/lforms-versions/34.0.0/webcomponent/lhc-forms.js</li>
     </ol>
     <p>The zone.min.js file should be left out if you already have that in your
     page (e.g. if the page contains an Angular app).</p>
@@ -201,23 +201,22 @@ <h2>
   support.  The first file provides support for STU3 and R4 versions of FHIR,
   and the other two provide support for one specific version.
     <ul style="padding-left: 0">
-      <li>https://clinicaltables.nlm.nih.gov/lforms-versions/34.0.0/fhir/lformsFHIRAll.min.js</li>
-      <li><b>OR</b> https://clinicaltables.nlm.nih.gov/lforms-versions/34.0.0/fhir/R4/lformsFHIR.min.js</li>
-      <li><b>OR</b> https://clinicaltables.nlm.nih.gov/lforms-versions/34.0.0/fhir/STU3/lformsFHIR.min.js</li>
+      <li>https://lhcforms-static.nlm.nih.gov/lforms-versions/34.0.0/fhir/lformsFHIRAll.min.js</li>
+      <li><b>OR</b> https://lhcforms-static.nlm.nih.gov/lforms-versions/34.0.0/fhir/R4/lformsFHIR.min.js</li>
+      <li><b>OR</b> https://lhcforms-static.nlm.nih.gov/lforms-versions/34.0.0/fhir/STU3/lformsFHIR.min.js</li>
     </ul>
   </dd>
 </dl>
 
 <p>Note that the URLs contain a release version number, 34.0.0, for which you
 can substitute any of the other prebuilt versions (34 or higher) available at
-https://clinicaltables.nlm.nih.gov/lforms-versions.</p>
+https://lhcforms-static.nlm.nih.gov/lforms-versions.</p>
 
-<p>For production applications, it is probably better to download these files
-and serve them from your server, to avoid introducing a dependency on the
-clinicaltables servers, though you may continue to link to clinicaltables if you
-wish.  Zip files of each version's files are avaialble at
+<p>For production applications, if you would prefer to download these files
+and serve them from your server to avoid introducing a dependency on the
+lhcforms-static servers, zip files of each version's files are avaialble at
 <a
-href="https://clinicaltables.nlm.nih.gov/lforms-versions">https://clinicaltables.nlm.nih.gov/lforms-versions</a>.</p>
+href="https://lhcforms-static.nlm.nih.gov/lforms-versions">https://lhcforms-static.nlm.nih.gov/lforms-versions</a>.</p>
 
 <p id=npmInstall>If you decide to use the npm package, note that for now the JavaScript files
 do not work when the package is required or imported, so you will still need to