diff --git a/dist/index.js b/dist/index.js
index bed1b17..a27be31 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -10881,8 +10881,8 @@ module.exports = {
         power: 1.44,
         rating: "E",
         recharge: 476,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 800
       }, {
         ammocost: 300,
@@ -10900,8 +10900,8 @@ module.exports = {
         power: 1.92,
         rating: "D",
         recharge: 629,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 800
       }, {
         ammocost: 300,
@@ -10919,8 +10919,8 @@ module.exports = {
         power: 2.4,
         rating: "C",
         recharge: 799,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 800
       }, {
         ammocost: 300,
@@ -10938,8 +10938,8 @@ module.exports = {
         power: 2.88,
         rating: "B",
         recharge: 952,
-        rechargeRating: "B",
-        spinUpTime: 5,
+        rechargerating: "B",
+        spinup: 5,
         thermload: 800
       }, {
         ammocost: 300,
@@ -10957,28 +10957,28 @@ module.exports = {
         power: 3.36,
         rating: "A",
         recharge: 1105,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 800
       }, {
-        thermload: 720,
-        spinUpTime: 5,
-        rechargeRating: "E",
-        recharge: 264,
-        rating: "E",
-        power: 1.24,
-        mass: 80,
-        integrity: 105,
-        id: "60",
-        grp: "scb",
-        eddbID: 1181,
-        edID: 128064328,
-        duration: 11,
-        cost: 249137,
-        class: 7,
-        cells: 6,
+        ammocost: 300,
         boot: 25,
-        ammocost: 300
+        cells: 6,
+        class: 7,
+        cost: 249137,
+        duration: 11,
+        edID: 128064328,
+        eddbID: 1181,
+        grp: "scb",
+        id: "60",
+        integrity: 105,
+        mass: 80,
+        power: 1.24,
+        rating: "E",
+        recharge: 264,
+        rechargerating: "E",
+        spinup: 5,
+        thermload: 720
       }, {
         ammocost: 300,
         boot: 25,
@@ -10995,8 +10995,8 @@ module.exports = {
         power: 1.66,
         rating: "D",
         recharge: 352,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 720
       }, {
         ammocost: 300,
@@ -11014,8 +11014,8 @@ module.exports = {
         power: 2.07,
         rating: "C",
         recharge: 451,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 720
       }, {
         ammocost: 300,
@@ -11033,8 +11033,8 @@ module.exports = {
         power: 2.48,
         rating: "B",
         recharge: 539,
-        rechargeRating: "B",
-        spinUpTime: 5,
+        rechargerating: "B",
+        spinup: 5,
         thermload: 720
       }, {
         ammocost: 300,
@@ -11052,8 +11052,8 @@ module.exports = {
         power: 2.9,
         rating: "A",
         recharge: 627,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 720
       }, {
         ammocost: 300,
@@ -11071,8 +11071,8 @@ module.exports = {
         power: 1.06,
         rating: "E",
         recharge: 160,
-        rechargeRating: "E",
-        spinUpTime: 5,
+        rechargerating: "E",
+        spinup: 5,
         thermload: 640
       }, {
         ammocost: 300,
@@ -11090,9 +11090,9 @@ module.exports = {
         power: 1.42,
         rating: "D",
         recharge: 208,
-        rechargeRating: "D",
-        spinUpTime: 5,
-        thermload: 410
+        rechargerating: "D",
+        spinup: 5,
+        thermload: 640
       }, {
         ammocost: 300,
         boot: 25,
@@ -11109,9 +11109,9 @@ module.exports = {
         power: 1.77,
         rating: "C",
         recharge: 264,
-        rechargeRating: "C",
-        spinUpTime: 5,
-        thermload: 410
+        rechargerating: "C",
+        spinup: 5,
+        thermload: 640
       }, {
         ammocost: 300,
         boot: 25,
@@ -11128,9 +11128,9 @@ module.exports = {
         power: 2.12,
         rating: "B",
         recharge: 312,
-        rechargeRating: "B",
-        spinUpTime: 5,
-        thermload: 410
+        rechargerating: "B",
+        spinup: 5,
+        thermload: 640
       }, {
         ammocost: 300,
         boot: 25,
@@ -11147,9 +11147,9 @@ module.exports = {
         power: 2.48,
         rating: "A",
         recharge: 368,
-        rechargeRating: "A",
-        spinUpTime: 5,
-        thermload: 410
+        rechargerating: "A",
+        spinup: 5,
+        thermload: 640
       }, {
         ammocost: 300,
         boot: 25,
@@ -11166,8 +11166,8 @@ module.exports = {
         power: .9,
         rating: "E",
         recharge: 105,
-        rechargeRating: "E",
-        spinUpTime: 5,
+        rechargerating: "E",
+        spinup: 5,
         thermload: 540
       }, {
         ammocost: 300,
@@ -11185,8 +11185,8 @@ module.exports = {
         power: 1.2,
         rating: "D",
         recharge: 140,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 540
       }, {
         ammocost: 300,
@@ -11204,8 +11204,8 @@ module.exports = {
         power: 1.5,
         rating: "C",
         recharge: 175,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 540
       }, {
         ammocost: 300,
@@ -11223,8 +11223,8 @@ module.exports = {
         power: 1.8,
         rating: "B",
         recharge: 205,
-        rechargeRating: "B",
-        spinUpTime: 5,
+        rechargerating: "B",
+        spinup: 5,
         thermload: 540
       }, {
         ammocost: 300,
@@ -11242,8 +11242,8 @@ module.exports = {
         power: 2.1,
         rating: "A",
         recharge: 240,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 540
       }, {
         ammocost: 300,
@@ -11261,8 +11261,8 @@ module.exports = {
         power: .74,
         rating: "E",
         recharge: 60,
-        rechargeRating: "E",
-        spinUpTime: 5,
+        rechargerating: "E",
+        spinup: 5,
         thermload: 410
       }, {
         ammocost: 300,
@@ -11280,8 +11280,8 @@ module.exports = {
         power: .98,
         rating: "D",
         recharge: 78,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 410
       }, {
         ammocost: 300,
@@ -11299,8 +11299,8 @@ module.exports = {
         power: 1.23,
         rating: "C",
         recharge: 99,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 410
       }, {
         ammocost: 300,
@@ -11318,8 +11318,8 @@ module.exports = {
         power: 1.48,
         rating: "B",
         recharge: 117,
-        rechargeRating: "B",
-        spinUpTime: 5,
+        rechargerating: "B",
+        spinup: 5,
         thermload: 410
       }, {
         ammocost: 300,
@@ -11337,8 +11337,8 @@ module.exports = {
         power: 1.72,
         rating: "A",
         recharge: 138,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 410
       }, {
         ammocost: 300,
@@ -11356,8 +11356,8 @@ module.exports = {
         power: .61,
         rating: "E",
         recharge: 34,
-        rechargeRating: "E",
-        spinUpTime: 5,
+        rechargerating: "E",
+        spinup: 5,
         thermload: 340
       }, {
         ammocost: 300,
@@ -11375,8 +11375,8 @@ module.exports = {
         power: .82,
         rating: "D",
         recharge: 46,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 340
       }, {
         ammocost: 300,
@@ -11394,8 +11394,8 @@ module.exports = {
         power: 1.02,
         rating: "C",
         recharge: 58,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 340
       }, {
         ammocost: 300,
@@ -11413,8 +11413,8 @@ module.exports = {
         power: 1.22,
         rating: "B",
         recharge: 70,
-        rechargeRating: "B",
-        spinUpTime: 5,
+        rechargerating: "B",
+        spinup: 5,
         thermload: 340
       }, {
         ammocost: 300,
@@ -11432,8 +11432,8 @@ module.exports = {
         power: 1.43,
         rating: "A",
         recharge: 82,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 340
       }, {
         ammocost: 300,
@@ -11451,8 +11451,8 @@ module.exports = {
         power: .5,
         rating: "E",
         recharge: 28,
-        rechargeRating: "E",
-        spinUpTime: 5,
+        rechargerating: "E",
+        spinup: 5,
         thermload: 240
       }, {
         ammocost: 300,
@@ -11470,8 +11470,8 @@ module.exports = {
         power: .67,
         rating: "D",
         recharge: 36,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 240
       }, {
         ammocost: 300,
@@ -11489,28 +11489,28 @@ module.exports = {
         power: .84,
         rating: "C",
         recharge: 46,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 240
       }, {
-        thermload: 240,
-        spinUpTime: 5,
-        rechargeRating: "B",
-        recharge: 56,
-        rating: "B",
-        power: 1.01,
-        mass: 4,
-        integrity: 71,
-        id: "54",
-        grp: "scb",
-        eddbID: 1159,
-        edID: 128064306,
-        duration: 2,
-        cost: 22619,
-        class: 2,
-        cells: 5,
+        ammocost: 300,
         boot: 25,
-        ammocost: 300
+        cells: 5,
+        class: 2,
+        cost: 22619,
+        duration: 2,
+        edID: 128064306,
+        eddbID: 1159,
+        grp: "scb",
+        id: "54",
+        integrity: 71,
+        mass: 4,
+        power: 1.01,
+        rating: "B",
+        recharge: 56,
+        rechargerating: "B",
+        spinup: 5,
+        thermload: 240
       }, {
         ammocost: 300,
         boot: 25,
@@ -11527,8 +11527,8 @@ module.exports = {
         power: 1.18,
         rating: "A",
         recharge: 64,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 240
       }, {
         ammocost: 300,
@@ -11546,8 +11546,8 @@ module.exports = {
         power: .41,
         rating: "E",
         recharge: 12,
-        rechargeRating: "E",
-        spinUpTime: 5,
+        rechargerating: "E",
+        spinup: 5,
         thermload: 170
       }, {
         ammocost: 300,
@@ -11565,8 +11565,8 @@ module.exports = {
         power: .55,
         rating: "D",
         recharge: 12.5,
-        rechargeRating: "D",
-        spinUpTime: 5,
+        rechargerating: "D",
+        spinup: 5,
         thermload: 170
       }, {
         ammocost: 300,
@@ -11584,8 +11584,8 @@ module.exports = {
         power: .69,
         rating: "C",
         recharge: 20,
-        rechargeRating: "C",
-        spinUpTime: 5,
+        rechargerating: "C",
+        spinup: 5,
         thermload: 170
       }, {
         ammocost: 300,
@@ -11603,8 +11603,8 @@ module.exports = {
         power: .83,
         rating: "B",
         recharge: 24,
-        rechargeRating: "B",
-        spinUpTime: 5,
+        rechargerating: "B",
+        spinup: 5,
         thermload: 170
       }, {
         ammocost: 300,
@@ -11622,8 +11622,8 @@ module.exports = {
         power: .97,
         rating: "A",
         recharge: 28,
-        rechargeRating: "A",
-        spinUpTime: 5,
+        rechargerating: "A",
+        spinup: 5,
         thermload: 170
       } ],
       sg: [ {
diff --git a/dist/index.json b/dist/index.json
index 638057c..11d2629 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -13197,8 +13197,8 @@
 					"power": 1.44,
 					"rating": "E",
 					"recharge": 476,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 800
 				},
 				{
@@ -13217,8 +13217,8 @@
 					"power": 1.92,
 					"rating": "D",
 					"recharge": 629,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 800
 				},
 				{
@@ -13237,8 +13237,8 @@
 					"power": 2.4,
 					"rating": "C",
 					"recharge": 799,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 800
 				},
 				{
@@ -13257,8 +13257,8 @@
 					"power": 2.88,
 					"rating": "B",
 					"recharge": 952,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
+					"rechargerating": "B",
+					"spinup": 5,
 					"thermload": 800
 				},
 				{
@@ -13277,29 +13277,29 @@
 					"power": 3.36,
 					"rating": "A",
 					"recharge": 1105,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 800
 				},
 				{
-					"thermload": 720,
-					"spinUpTime": 5,
-					"rechargeRating": "E",
-					"recharge": 264,
-					"rating": "E",
-					"power": 1.24,
-					"mass": 80,
-					"integrity": 105,
-					"id": "60",
-					"grp": "scb",
-					"eddbID": 1181,
-					"edID": 128064328,
-					"duration": 11,
-					"cost": 249137,
-					"class": 7,
-					"cells": 6,
+					"ammocost": 300,
 					"boot": 25,
-					"ammocost": 300
+					"cells": 6,
+					"class": 7,
+					"cost": 249137,
+					"duration": 11,
+					"edID": 128064328,
+					"eddbID": 1181,
+					"grp": "scb",
+					"id": "60",
+					"integrity": 105,
+					"mass": 80,
+					"power": 1.24,
+					"rating": "E",
+					"recharge": 264,
+					"rechargerating": "E",
+					"spinup": 5,
+					"thermload": 720
 				},
 				{
 					"ammocost": 300,
@@ -13317,8 +13317,8 @@
 					"power": 1.66,
 					"rating": "D",
 					"recharge": 352,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 720
 				},
 				{
@@ -13337,8 +13337,8 @@
 					"power": 2.07,
 					"rating": "C",
 					"recharge": 451,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 720
 				},
 				{
@@ -13357,8 +13357,8 @@
 					"power": 2.48,
 					"rating": "B",
 					"recharge": 539,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
+					"rechargerating": "B",
+					"spinup": 5,
 					"thermload": 720
 				},
 				{
@@ -13377,8 +13377,8 @@
 					"power": 2.9,
 					"rating": "A",
 					"recharge": 627,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 720
 				},
 				{
@@ -13397,8 +13397,8 @@
 					"power": 1.06,
 					"rating": "E",
 					"recharge": 160,
-					"rechargeRating": "E",
-					"spinUpTime": 5,
+					"rechargerating": "E",
+					"spinup": 5,
 					"thermload": 640
 				},
 				{
@@ -13417,9 +13417,9 @@
 					"power": 1.42,
 					"rating": "D",
 					"recharge": 208,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
-					"thermload": 410
+					"rechargerating": "D",
+					"spinup": 5,
+					"thermload": 640
 				},
 				{
 					"ammocost": 300,
@@ -13437,9 +13437,9 @@
 					"power": 1.77,
 					"rating": "C",
 					"recharge": 264,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
-					"thermload": 410
+					"rechargerating": "C",
+					"spinup": 5,
+					"thermload": 640
 				},
 				{
 					"ammocost": 300,
@@ -13457,9 +13457,9 @@
 					"power": 2.12,
 					"rating": "B",
 					"recharge": 312,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
-					"thermload": 410
+					"rechargerating": "B",
+					"spinup": 5,
+					"thermload": 640
 				},
 				{
 					"ammocost": 300,
@@ -13477,9 +13477,9 @@
 					"power": 2.48,
 					"rating": "A",
 					"recharge": 368,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
-					"thermload": 410
+					"rechargerating": "A",
+					"spinup": 5,
+					"thermload": 640
 				},
 				{
 					"ammocost": 300,
@@ -13497,8 +13497,8 @@
 					"power": 0.9,
 					"rating": "E",
 					"recharge": 105,
-					"rechargeRating": "E",
-					"spinUpTime": 5,
+					"rechargerating": "E",
+					"spinup": 5,
 					"thermload": 540
 				},
 				{
@@ -13517,8 +13517,8 @@
 					"power": 1.2,
 					"rating": "D",
 					"recharge": 140,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 540
 				},
 				{
@@ -13537,8 +13537,8 @@
 					"power": 1.5,
 					"rating": "C",
 					"recharge": 175,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 540
 				},
 				{
@@ -13557,8 +13557,8 @@
 					"power": 1.8,
 					"rating": "B",
 					"recharge": 205,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
+					"rechargerating": "B",
+					"spinup": 5,
 					"thermload": 540
 				},
 				{
@@ -13577,8 +13577,8 @@
 					"power": 2.1,
 					"rating": "A",
 					"recharge": 240,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 540
 				},
 				{
@@ -13597,8 +13597,8 @@
 					"power": 0.74,
 					"rating": "E",
 					"recharge": 60,
-					"rechargeRating": "E",
-					"spinUpTime": 5,
+					"rechargerating": "E",
+					"spinup": 5,
 					"thermload": 410
 				},
 				{
@@ -13617,8 +13617,8 @@
 					"power": 0.98,
 					"rating": "D",
 					"recharge": 78,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 410
 				},
 				{
@@ -13637,8 +13637,8 @@
 					"power": 1.23,
 					"rating": "C",
 					"recharge": 99,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 410
 				},
 				{
@@ -13657,8 +13657,8 @@
 					"power": 1.48,
 					"rating": "B",
 					"recharge": 117,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
+					"rechargerating": "B",
+					"spinup": 5,
 					"thermload": 410
 				},
 				{
@@ -13677,8 +13677,8 @@
 					"power": 1.72,
 					"rating": "A",
 					"recharge": 138,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 410
 				},
 				{
@@ -13697,8 +13697,8 @@
 					"power": 0.61,
 					"rating": "E",
 					"recharge": 34,
-					"rechargeRating": "E",
-					"spinUpTime": 5,
+					"rechargerating": "E",
+					"spinup": 5,
 					"thermload": 340
 				},
 				{
@@ -13717,8 +13717,8 @@
 					"power": 0.82,
 					"rating": "D",
 					"recharge": 46,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 340
 				},
 				{
@@ -13737,8 +13737,8 @@
 					"power": 1.02,
 					"rating": "C",
 					"recharge": 58,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 340
 				},
 				{
@@ -13757,8 +13757,8 @@
 					"power": 1.22,
 					"rating": "B",
 					"recharge": 70,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
+					"rechargerating": "B",
+					"spinup": 5,
 					"thermload": 340
 				},
 				{
@@ -13777,8 +13777,8 @@
 					"power": 1.43,
 					"rating": "A",
 					"recharge": 82,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 340
 				},
 				{
@@ -13797,8 +13797,8 @@
 					"power": 0.5,
 					"rating": "E",
 					"recharge": 28,
-					"rechargeRating": "E",
-					"spinUpTime": 5,
+					"rechargerating": "E",
+					"spinup": 5,
 					"thermload": 240
 				},
 				{
@@ -13817,8 +13817,8 @@
 					"power": 0.67,
 					"rating": "D",
 					"recharge": 36,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 240
 				},
 				{
@@ -13837,29 +13837,29 @@
 					"power": 0.84,
 					"rating": "C",
 					"recharge": 46,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 240
 				},
 				{
-					"thermload": 240,
-					"spinUpTime": 5,
-					"rechargeRating": "B",
-					"recharge": 56,
-					"rating": "B",
-					"power": 1.01,
-					"mass": 4,
-					"integrity": 71,
-					"id": "54",
-					"grp": "scb",
-					"eddbID": 1159,
-					"edID": 128064306,
-					"duration": 2,
-					"cost": 22619,
-					"class": 2,
-					"cells": 5,
+					"ammocost": 300,
 					"boot": 25,
-					"ammocost": 300
+					"cells": 5,
+					"class": 2,
+					"cost": 22619,
+					"duration": 2,
+					"edID": 128064306,
+					"eddbID": 1159,
+					"grp": "scb",
+					"id": "54",
+					"integrity": 71,
+					"mass": 4,
+					"power": 1.01,
+					"rating": "B",
+					"recharge": 56,
+					"rechargerating": "B",
+					"spinup": 5,
+					"thermload": 240
 				},
 				{
 					"ammocost": 300,
@@ -13877,8 +13877,8 @@
 					"power": 1.18,
 					"rating": "A",
 					"recharge": 64,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 240
 				},
 				{
@@ -13897,8 +13897,8 @@
 					"power": 0.41,
 					"rating": "E",
 					"recharge": 12,
-					"rechargeRating": "E",
-					"spinUpTime": 5,
+					"rechargerating": "E",
+					"spinup": 5,
 					"thermload": 170
 				},
 				{
@@ -13917,8 +13917,8 @@
 					"power": 0.55,
 					"rating": "D",
 					"recharge": 12.5,
-					"rechargeRating": "D",
-					"spinUpTime": 5,
+					"rechargerating": "D",
+					"spinup": 5,
 					"thermload": 170
 				},
 				{
@@ -13937,8 +13937,8 @@
 					"power": 0.69,
 					"rating": "C",
 					"recharge": 20,
-					"rechargeRating": "C",
-					"spinUpTime": 5,
+					"rechargerating": "C",
+					"spinup": 5,
 					"thermload": 170
 				},
 				{
@@ -13957,8 +13957,8 @@
 					"power": 0.83,
 					"rating": "B",
 					"recharge": 24,
-					"rechargeRating": "B",
-					"spinUpTime": 5,
+					"rechargerating": "B",
+					"spinup": 5,
 					"thermload": 170
 				},
 				{
@@ -13977,8 +13977,8 @@
 					"power": 0.97,
 					"rating": "A",
 					"recharge": 28,
-					"rechargeRating": "A",
-					"spinUpTime": 5,
+					"rechargerating": "A",
+					"spinup": 5,
 					"thermload": 170
 				}
 			],
diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json
index de2b251..e7e5f7a 100644
--- a/modules/internal/shield_cell_bank.json
+++ b/modules/internal/shield_cell_bank.json
@@ -16,8 +16,8 @@
       "power": 1.44,
       "rating": "E",
       "recharge": 476,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 800
     },
     {
@@ -36,8 +36,8 @@
       "power": 1.92,
       "rating": "D",
       "recharge": 629,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 800
     },
     {
@@ -56,8 +56,8 @@
       "power": 2.4,
       "rating": "C",
       "recharge": 799,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 800
     },
     {
@@ -76,8 +76,8 @@
       "power": 2.88,
       "rating": "B",
       "recharge": 952,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
+      "rechargerating": "B",
+      "spinup": 5,
       "thermload": 800
     },
     {
@@ -96,29 +96,29 @@
       "power": 3.36,
       "rating": "A",
       "recharge": 1105,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 800
     },
     {
-      "thermload": 720,
-      "spinUpTime": 5,
-      "rechargeRating": "E",
-      "recharge": 264,
-      "rating": "E",
-      "power": 1.24,
-      "mass": 80,
-      "integrity": 105,
-      "id": "60",
-      "grp": "scb",
-      "eddbID": 1181,
-      "edID": 128064328,
-      "duration": 11,
-      "cost": 249137,
-      "class": 7,
-      "cells": 6,
+      "ammocost": 300,
       "boot": 25,
-      "ammocost": 300
+      "cells": 6,
+      "class": 7,
+      "cost": 249137,
+      "duration": 11,
+      "edID": 128064328,
+      "eddbID": 1181,
+      "grp": "scb",
+      "id": "60",
+      "integrity": 105,
+      "mass": 80,
+      "power": 1.24,
+      "rating": "E",
+      "recharge": 264,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 720
     },
     {
       "ammocost": 300,
@@ -136,8 +136,8 @@
       "power": 1.66,
       "rating": "D",
       "recharge": 352,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 720
     },
     {
@@ -156,8 +156,8 @@
       "power": 2.07,
       "rating": "C",
       "recharge": 451,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 720
     },
     {
@@ -176,8 +176,8 @@
       "power": 2.48,
       "rating": "B",
       "recharge": 539,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
+      "rechargerating": "B",
+      "spinup": 5,
       "thermload": 720
     },
     {
@@ -196,8 +196,8 @@
       "power": 2.9,
       "rating": "A",
       "recharge": 627,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 720
     },
     {
@@ -216,8 +216,8 @@
       "power": 1.06,
       "rating": "E",
       "recharge": 160,
-      "rechargeRating": "E",
-      "spinUpTime": 5,
+      "rechargerating": "E",
+      "spinup": 5,
       "thermload": 640
     },
     {
@@ -236,9 +236,9 @@
       "power": 1.42,
       "rating": "D",
       "recharge": 208,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
-      "thermload": 410
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
@@ -256,9 +256,9 @@
       "power": 1.77,
       "rating": "C",
       "recharge": 264,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
-      "thermload": 410
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
@@ -276,9 +276,9 @@
       "power": 2.12,
       "rating": "B",
       "recharge": 312,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
-      "thermload": 410
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
@@ -296,9 +296,9 @@
       "power": 2.48,
       "rating": "A",
       "recharge": 368,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
-      "thermload": 410
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
@@ -316,8 +316,8 @@
       "power": 0.9,
       "rating": "E",
       "recharge": 105,
-      "rechargeRating": "E",
-      "spinUpTime": 5,
+      "rechargerating": "E",
+      "spinup": 5,
       "thermload": 540
     },
     {
@@ -336,8 +336,8 @@
       "power": 1.2,
       "rating": "D",
       "recharge": 140,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 540
     },
     {
@@ -356,8 +356,8 @@
       "power": 1.5,
       "rating": "C",
       "recharge": 175,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 540
     },
     {
@@ -376,8 +376,8 @@
       "power": 1.8,
       "rating": "B",
       "recharge": 205,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
+      "rechargerating": "B",
+      "spinup": 5,
       "thermload": 540
     },
     {
@@ -396,8 +396,8 @@
       "power": 2.1,
       "rating": "A",
       "recharge": 240,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 540
     },
     {
@@ -416,8 +416,8 @@
       "power": 0.74,
       "rating": "E",
       "recharge": 60,
-      "rechargeRating": "E",
-      "spinUpTime": 5,
+      "rechargerating": "E",
+      "spinup": 5,
       "thermload": 410
     },
     {
@@ -436,8 +436,8 @@
       "power": 0.98,
       "rating": "D",
       "recharge": 78,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 410
     },
     {
@@ -456,8 +456,8 @@
       "power": 1.23,
       "rating": "C",
       "recharge": 99,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 410
     },
     {
@@ -476,8 +476,8 @@
       "power": 1.48,
       "rating": "B",
       "recharge": 117,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
+      "rechargerating": "B",
+      "spinup": 5,
       "thermload": 410
     },
     {
@@ -496,8 +496,8 @@
       "power": 1.72,
       "rating": "A",
       "recharge": 138,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 410
     },
     {
@@ -516,8 +516,8 @@
       "power": 0.61,
       "rating": "E",
       "recharge": 34,
-      "rechargeRating": "E",
-      "spinUpTime": 5,
+      "rechargerating": "E",
+      "spinup": 5,
       "thermload": 340
     },
     {
@@ -536,8 +536,8 @@
       "power": 0.82,
       "rating": "D",
       "recharge": 46,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 340
     },
     {
@@ -556,8 +556,8 @@
       "power": 1.02,
       "rating": "C",
       "recharge": 58,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 340
     },
     {
@@ -576,8 +576,8 @@
       "power": 1.22,
       "rating": "B",
       "recharge": 70,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
+      "rechargerating": "B",
+      "spinup": 5,
       "thermload": 340
     },
     {
@@ -596,8 +596,8 @@
       "power": 1.43,
       "rating": "A",
       "recharge": 82,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 340
     },
     {
@@ -616,8 +616,8 @@
       "power": 0.5,
       "rating": "E",
       "recharge": 28,
-      "rechargeRating": "E",
-      "spinUpTime": 5,
+      "rechargerating": "E",
+      "spinup": 5,
       "thermload": 240
     },
     {
@@ -636,8 +636,8 @@
       "power": 0.67,
       "rating": "D",
       "recharge": 36,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 240
     },
     {
@@ -656,29 +656,29 @@
       "power": 0.84,
       "rating": "C",
       "recharge": 46,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 240
     },
     {
-      "thermload": 240,
-      "spinUpTime": 5,
-      "rechargeRating": "B",
-      "recharge": 56,
-      "rating": "B",
-      "power": 1.01,
-      "mass": 4,
-      "integrity": 71,
-      "id": "54",
-      "grp": "scb",
-      "eddbID": 1159,
-      "edID": 128064306,
-      "duration": 2,
-      "cost": 22619,
-      "class": 2,
-      "cells": 5,
+      "ammocost": 300,
       "boot": 25,
-      "ammocost": 300
+      "cells": 5,
+      "class": 2,
+      "cost": 22619,
+      "duration": 2,
+      "edID": 128064306,
+      "eddbID": 1159,
+      "grp": "scb",
+      "id": "54",
+      "integrity": 71,
+      "mass": 4,
+      "power": 1.01,
+      "rating": "B",
+      "recharge": 56,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 240
     },
     {
       "ammocost": 300,
@@ -696,8 +696,8 @@
       "power": 1.18,
       "rating": "A",
       "recharge": 64,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 240
     },
     {
@@ -716,8 +716,8 @@
       "power": 0.41,
       "rating": "E",
       "recharge": 12,
-      "rechargeRating": "E",
-      "spinUpTime": 5,
+      "rechargerating": "E",
+      "spinup": 5,
       "thermload": 170
     },
     {
@@ -736,8 +736,8 @@
       "power": 0.55,
       "rating": "D",
       "recharge": 12.5,
-      "rechargeRating": "D",
-      "spinUpTime": 5,
+      "rechargerating": "D",
+      "spinup": 5,
       "thermload": 170
     },
     {
@@ -756,8 +756,8 @@
       "power": 0.69,
       "rating": "C",
       "recharge": 20,
-      "rechargeRating": "C",
-      "spinUpTime": 5,
+      "rechargerating": "C",
+      "spinup": 5,
       "thermload": 170
     },
     {
@@ -776,8 +776,8 @@
       "power": 0.83,
       "rating": "B",
       "recharge": 24,
-      "rechargeRating": "B",
-      "spinUpTime": 5,
+      "rechargerating": "B",
+      "spinup": 5,
       "thermload": 170
     },
     {
@@ -796,9 +796,9 @@
       "power": 0.97,
       "rating": "A",
       "recharge": 28,
-      "rechargeRating": "A",
-      "spinUpTime": 5,
+      "rechargerating": "A",
+      "spinup": 5,
       "thermload": 170
     }
   ]
-}
\ No newline at end of file
+}