diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html
index c148b21c7..b1eb20cab 100644
--- a/_includes/machine-engines.html
+++ b/_includes/machine-engines.html
@@ -34,6 +34,11 @@ of our Markdown or XML documents.  Examples: 'automount' becomes 'autoMount', 'a
 {% endcomment %}
 {% for machine in page.machines %}
   {% capture machine_type %}{{ machine.type | remove:"-dbg" }}{% endcapture %}
+  {% if machine_type != "pc" and machine_type != "c1p" %}
+      {% capture machine_app %}{{ machine_type }}{% endcapture %}
+    {% else %}
+      {% capture machine_app %}{{ machine_type }}js{% endcapture %}
+  {% endif %}
   {% if machine.debugger %}
     {% capture machine_file %}{{ machine_type }}-dbg{% endcapture %}
   {% else %}
@@ -88,13 +93,13 @@ of our Markdown or XML documents.  Examples: 'automount' becomes 'autoMount', 'a
   {% endunless %}
   {% capture machine_parms %}{{ site.left_brace }}autoMount:{{ machine_autoMount }}{{ machine_autoPower }}{{ machine_autoStart }}{{ machine_drives }},state:"{{ machine.state }}",messages:"{{ machine.messages }}"{{ site.right_brace }}{% endcapture %}
   {% if site.pcjs.compiled == true and machine.uncompiled != true %}
-    {% capture machine_script %}<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine_type }}js/{{ site.pcjs.version }}/{{ machine_file }}.js"></script>{% endcapture %}
+    {% capture machine_script %}<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine_app }}/{{ site.pcjs.version }}/{{ machine_file }}.js"></script>{% endcapture %}
     {% unless machine_scripts contains machine_script %}
       {{ machine_script }}
     {% endunless %}
     {% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %}
     {% if machine_template == "" %}
-      {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine_type }}js/{{ site.pcjs.version }}/components.xsl{% endcapture %}
+      {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine_app }}/{{ site.pcjs.version }}/components.xsl{% endcapture %}
     {% endif %}
   {% else %}
     {% if machine_type == "c1p" %}{% assign array_scripts = site.pcjs.c1p_scripts %}{% endif %}
@@ -120,10 +125,10 @@ of our Markdown or XML documents.  Examples: 'automount' becomes 'autoMount', 'a
       {% endif %}
     {% endfor %}
     {% if machine_template == "" %}
-      {% if machine_type != "c1p" %}
+      {% if machine_app != "c1pjs" %}
         {% capture machine_template %}{{ site.baseurl }}/modules/shared/templates/components.xsl{% endcapture %}
       {% else %}
-        {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine_type }}js/templates/components.xsl{% endcapture %}
+        {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine_app }}/templates/components.xsl{% endcapture %}
       {% endif %}
     {% endif %}
   {% endif %}
diff --git a/_includes/machine-styles.html b/_includes/machine-styles.html
index 9a2403b78..9c16c6098 100644
--- a/_includes/machine-styles.html
+++ b/_includes/machine-styles.html
@@ -1,13 +1,18 @@
 {% for machine in page.machines %}
   {% capture machine_type %}{{ machine.type | remove:"-dbg" }}{% endcapture %}
+  {% if machine_type != "pc" and machine_type != "c1p" %}
+      {% capture machine_app %}{{ machine_type }}{% endcapture %}
+    {% else %}
+      {% capture machine_app %}{{ machine_type }}js{% endcapture %}
+  {% endif %}
   {% unless site.pcjs.compiled == true and machine.uncompiled != true %}
-    {% if machine_type != "c1p" %}
+    {% if machine_app != "c1pjs" %}
       {% capture machine_style %}{{ site.baseurl }}/modules/shared/templates/components.css{% endcapture %}
     {% else %}
-      {% capture machine_style %}{{ site.baseurl }}/modules/{{ machine_type }}js/templates/components.css{% endcapture %}
+      {% capture machine_style %}{{ site.baseurl }}/modules/{{ machine_app }}/templates/components.css{% endcapture %}
     {% endif %}
   {% else %}
-    {% capture machine_style %}{{ site.baseurl }}/versions/{{ machine_type }}js/{{ site.pcjs.version }}/components.css{% endcapture %}
+    {% capture machine_style %}{{ site.baseurl }}/versions/{{ machine_app }}/{{ site.pcjs.version }}/components.css{% endcapture %}
   {% endunless %}
   {% unless machine_styles contains machine_style %}
 	<link rel="stylesheet" type="text/css" href="{{ machine_style }}">