diff --git a/VECTO/GUI/BatteryForm.Designer.vb b/VECTO/GUI/BatteryForm.Designer.vb
index 4a1407df7278a983089f92874d32317132a4a5c9..20061845e6032a91a005a4a5700d89abd388555d 100644
--- a/VECTO/GUI/BatteryForm.Designer.vb
+++ b/VECTO/GUI/BatteryForm.Designer.vb
@@ -105,9 +105,9 @@ Partial Class BatteryForm
         Me.lblCapacityUnit.AutoSize = true
         Me.lblCapacityUnit.Location = New System.Drawing.Point(153, 7)
         Me.lblCapacityUnit.Name = "lblCapacityUnit"
-        Me.lblCapacityUnit.Size = New System.Drawing.Size(25, 13)
+        Me.lblCapacityUnit.Size = New System.Drawing.Size(26, 13)
         Me.lblCapacityUnit.TabIndex = 24
-        Me.lblCapacityUnit.Text = "[As]"
+        Me.lblCapacityUnit.Text = "[Ah]"
         '
         'lblCapacity
         '
diff --git a/VECTO/GUI/BatteryForm.vb b/VECTO/GUI/BatteryForm.vb
index e1f2c39b2f0a8b43496d94f664750f2103f6c774..b7902b750e3d16923fc913ae88dddb8c30649834 100644
--- a/VECTO/GUI/BatteryForm.vb
+++ b/VECTO/GUI/BatteryForm.vb
@@ -174,7 +174,7 @@ Public Class BatteryForm
 
         Dim basePath As String = Path.GetDirectoryName(file)
         tbMakeModel.Text = battery.Model
-        tbCapacity.Text = battery.Capacity.ToGUIFormat()
+        tbCapacity.Text = battery.Capacity.AsAmpHour.ToGUIFormat()
 
         tbCFactor.Text = battery.MaxCurrentFactor.ToGUIFormat()
         tbSoCMin.Text = (battery.MinSOC * 100).ToGUIFormat()
diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb
index e5872052135160b61b4955acc50608ea72d46879..2e72a647b55638123ca1e6d9f5ed7d865748bc6a 100644
--- a/VECTO/Input Files/Battery.vb	
+++ b/VECTO/Input Files/Battery.vb	
@@ -213,7 +213,7 @@ Public Class Battery
 
     Public ReadOnly Property Capacity As AmpereSecond Implements IBatteryPackDeclarationInputData.Capacity
         Get
-            Return BatCapacity.SI(Of AmpereSecond)
+            Return BatCapacity.SI(Unit.SI.Ampere.Hour).Cast(Of AmpereSecond)
         End Get
     End Property
 
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 373b7924b90da68a9d7eecf85f926f1eb04bc2d4..71d19e9d9d2828c91e569b4f74cd5e5f429709aa 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -94,7 +94,7 @@ public class JSONFileWriter : IOutputFileWriter
 		body.Add("SavedInDeclMode", declMode);
 
 		body.Add("Model", battery.Model);
-		body.Add("Capacity", battery.Capacity.Value());
+		body.Add("Capacity", battery.Capacity.AsAmpHour);
 		body.Add("SOC_min", battery.MinSOC * 100.0);
 		body.Add("SOC_max",battery.MaxSOC * 100.0);
 		body.Add("MaxCurrentFactor", battery.MaxCurrentFactor);