diff --git a/template.json b/template.json
index 5dd69951..04b56318 100644
--- a/template.json
+++ b/template.json
@@ -419,25 +419,54 @@
         "dr": 0,
         "engpow": 1,
         "exhaustion": 0,
-        "hd": "",
-        "hp": {
-          "value": 10,
-          "max": 10,
-          "formula": "",
-          "temp": 0,
-          "tempmax": 0
+        "hulldie": "",
+        "hulldice": 0,
+        "hull": {
+          "value": 0,
+          "max": 0,
+          "formula": ""
+        },
+        "shlddie": "",
+        "shlddice": 0,
+        "shld": {
+          "value": 0,
+          "max": 0,
+          "formula": ""
         },
         "hsm": 1,
         "mods": {
           "open": 10,
           "max": 10
         },
-        "pd": "",
-        "sd": "",
-        "shieldpow": 1,
-        "sp": {
-          "formula": ""
+        "pwrdice": {
+          "pwrdie": "",
+          "recovery": 1,
+          "central": {
+            "value": 0,
+            "max": 0
+          },
+          "comms": {
+            "value": 0,
+            "max": 0
+          },
+          "engines": {
+            "value": 0,
+            "max": 0
+          },
+          "shields": {
+            "value": 0,
+            "max": 0
+          },
+          "sensors": {
+            "value": 0,
+            "max": 0
+          },
+          "weapons": {
+            "value": 0,
+            "max": 0
+          }
         },
+        "shieldpow": 1,
         "sscap": 0,
         "suites": {
           "open": 0,
diff --git a/templates/actors/newActor/starship.html b/templates/actors/newActor/starship.html
index 88169e89..3e760a7c 100644
--- a/templates/actors/newActor/starship.html
+++ b/templates/actors/newActor/starship.html
@@ -37,19 +37,19 @@
                 </footer>
 			</section>
 
-			{{!-- HIT POINTS --}}
+			{{!-- HULL POINTS --}}
 			<section class="attribute health" style="box-sizing: border-box; width: 150px;">
                 <h1 class="attribute-name rollable">{{ localize "SW5E.HullPoints" }}</h1>
                 <div class="attribute-value multiple">
-                    <input name="data.attributes.hp.value" type="text" value="{{data.attributes.hp.value}}"
+                    <input name="data.attributes.hull.value" type="text" value="{{data.attributes.hull.value}}"
                         data-dtype="Number" class="value-number" />
                     <span class="value-separator">/</span>
-                    <input name="data.attributes.hp.max" type="text" value="{{data.attributes.hp.max}}"
+                    <input name="data.attributes.hull.max" type="text" value="{{data.attributes.hull.max}}"
                         data-dtype="Number" class="value-number" />
                 </div>
                 <footer class="attribute-footer hit-points">
-                    <input name="data.attributes.hp.formula" class="hpformula" type="text"
-                            placeholder="{{ localize 'SW5E.HullPointsFormula' }}" value="{{data.attributes.hp.formula}}" style="min-width: 150px;" />
+                    <input name="data.attributes.hull.formula" class="hpformula" type="text"
+                            placeholder="{{ localize 'SW5E.HullPointsFormula' }}" value="{{data.attributes.hull.formula}}" style="min-width: 150px;" />
                 </footer>
             </section>
 			
@@ -57,15 +57,15 @@
 			<section class="attribute health" style="box-sizing: border-box; width: 150px;">
                 <h1 class="attribute-name rollable">{{ localize "SW5E.ShieldPoints" }}</h1>
                 <div class="attribute-value multiple">
-                    <input name="data.attributes.hp.temp" type="text" value="{{data.attributes.hp.temp}}"
+                    <input name="data.attributes.shld.value" type="text" value="{{data.attributes.shld.value}}"
                         data-dtype="Number" placeholder="10" class="value-number" />
                     <span class="value-separator">/</span>
-                    <input name="data.attributes.hp.tempmax" type="text" value="{{data.attributes.hp.tempmax}}"
+                    <input name="data.attributes.shld.max" type="text" value="{{data.attributes.shld.max}}"
                         data-dtype="Number" placeholder="10" class="value-number" />
                 </div>
                 <footer class="attribute-footer hit-points">
-                    <input name="data.attributes.sp.formula" class="hpformula" type="text"
-                            placeholder="{{ localize 'SW5E.ShieldPointsFormula' }}" value="{{data.attributes.sp.formula}}" style="min-width: 150px;" />
+                    <input name="data.attributes.shld.formula" class="hpformula" type="text"
+                            placeholder="{{ localize 'SW5E.ShieldPointsFormula' }}" value="{{data.attributes.shld.formula}}" style="min-width: 150px;" />
                 </footer>
             </section>