diff --git a/csharp/Lib/StatusApi/BatteryStatus.cs b/csharp/Lib/StatusApi/BatteryStatus.cs
index 0f1fedc46..6c656b1c9 100644
--- a/csharp/Lib/StatusApi/BatteryStatus.cs
+++ b/csharp/Lib/StatusApi/BatteryStatus.cs
@@ -10,7 +10,7 @@ using T = BatteryStatus;
 [OpParallel]
 public partial record BatteryStatus : DeviceStatus, IDcConnection
 {
-    public DcPhase     Dc          { get; init; }
+    public DcBus     Dc          { get; init; }
     public Percent     Soc         { get; init; }
     public Temperature Temperature { get; init; }
 }
diff --git a/csharp/Lib/StatusApi/Connections/IAc1Connection.cs b/csharp/Lib/StatusApi/Connections/IAc1Connection.cs
index d90b57938..54060cb20 100644
--- a/csharp/Lib/StatusApi/Connections/IAc1Connection.cs
+++ b/csharp/Lib/StatusApi/Connections/IAc1Connection.cs
@@ -4,5 +4,5 @@ namespace InnovEnergy.Lib.StatusApi.Connections;
 
 public interface IAc1Connection
 {
-    Ac1Phase Ac { get; }
+    Ac1Bus Ac { get; }
 }
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/Connections/IAc3Connection.cs b/csharp/Lib/StatusApi/Connections/IAc3Connection.cs
index b95939124..a1c0ca1b5 100644
--- a/csharp/Lib/StatusApi/Connections/IAc3Connection.cs
+++ b/csharp/Lib/StatusApi/Connections/IAc3Connection.cs
@@ -4,5 +4,5 @@ namespace InnovEnergy.Lib.StatusApi.Connections;
 
 public interface IAc3Connection
 {
-    Ac3Phase Ac { get; }
+    Ac3Bus Ac { get; }
 }
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/Connections/IDcConnection.cs b/csharp/Lib/StatusApi/Connections/IDcConnection.cs
index 6074a6750..04d83289f 100644
--- a/csharp/Lib/StatusApi/Connections/IDcConnection.cs
+++ b/csharp/Lib/StatusApi/Connections/IDcConnection.cs
@@ -5,5 +5,5 @@ namespace InnovEnergy.Lib.StatusApi.Connections;
 
 public interface IDcConnection
 {
-    DcPhase Dc { get; }
+    DcBus Dc { get; }
 }
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/Connections/IPvConnection.cs b/csharp/Lib/StatusApi/Connections/IPvConnection.cs
index a117f2d17..6dfddccea 100644
--- a/csharp/Lib/StatusApi/Connections/IPvConnection.cs
+++ b/csharp/Lib/StatusApi/Connections/IPvConnection.cs
@@ -4,5 +4,5 @@ namespace InnovEnergy.Lib.StatusApi.Connections;
 
 public interface IPvConnection
 {
-    IReadOnlyList<DcPhase> Strings { get;  }
+    IReadOnlyList<DcBus> Strings { get;  }
 }
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/DcDcConverterStatus.cs b/csharp/Lib/StatusApi/DcDcConverterStatus.cs
index de33033d2..21941d5e6 100644
--- a/csharp/Lib/StatusApi/DcDcConverterStatus.cs
+++ b/csharp/Lib/StatusApi/DcDcConverterStatus.cs
@@ -6,8 +6,8 @@ namespace InnovEnergy.Lib.StatusApi;
 [OpParallel]
 public partial record DcDcConverterStatus : DeviceStatus
 {
-    public DcPhase Left  { get; init; }
-    public DcPhase Right { get; init; }
+    public DcBus Left  { get; init; }
+    public DcBus Right { get; init; }
 }
     
  
diff --git a/csharp/Lib/StatusApi/MpptStatus.cs b/csharp/Lib/StatusApi/MpptStatus.cs
index 99d4df09b..53acdf439 100644
--- a/csharp/Lib/StatusApi/MpptStatus.cs
+++ b/csharp/Lib/StatusApi/MpptStatus.cs
@@ -7,8 +7,8 @@ namespace InnovEnergy.Lib.StatusApi;
 [OpParallel]
 public partial record MpptStatus : IDcConnection, IPvConnection
 {
-    public DcPhase                Dc      { get; init; }
-    public IReadOnlyList<DcPhase> Strings { get; init; }
+    public DcBus                Dc      { get; init; }
+    public IReadOnlyList<DcBus> Strings { get; init; }
 }
 
     
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/PowerMeterStatus.cs b/csharp/Lib/StatusApi/PowerMeterStatus.cs
index 26552861e..8140afef3 100644
--- a/csharp/Lib/StatusApi/PowerMeterStatus.cs
+++ b/csharp/Lib/StatusApi/PowerMeterStatus.cs
@@ -7,5 +7,5 @@ namespace InnovEnergy.Lib.StatusApi;
 [OpParallel]
 public partial record PowerMeterStatus : DeviceStatus, IAc3Connection
 {
-    public Ac3Phase Ac { get; init; }
+    public Ac3Bus Ac { get; init; }
 } 
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/SinglePhaseInverterStatus.cs b/csharp/Lib/StatusApi/SinglePhaseInverterStatus.cs
index caaec0d94..6688d8886 100644
--- a/csharp/Lib/StatusApi/SinglePhaseInverterStatus.cs
+++ b/csharp/Lib/StatusApi/SinglePhaseInverterStatus.cs
@@ -10,6 +10,6 @@ public partial record SinglePhaseInverterStatus :
     IAc1Connection, 
     IDcConnection
 {
-    public Ac1Phase Ac { get; init; }
-    public DcPhase  Dc { get; init; }
+    public Ac1Bus Ac { get; init; }
+    public DcBus  Dc { get; init; }
 }
diff --git a/csharp/Lib/StatusApi/SinglePhasePvInverterStatus.cs b/csharp/Lib/StatusApi/SinglePhasePvInverterStatus.cs
index d6d885a78..269254b6e 100644
--- a/csharp/Lib/StatusApi/SinglePhasePvInverterStatus.cs
+++ b/csharp/Lib/StatusApi/SinglePhasePvInverterStatus.cs
@@ -10,6 +10,6 @@ public partial record SinglePhasePvInverterStatus :
     IAc1Connection, 
     IPvConnection
 {
-    public Ac1Phase               Ac      { get; init; }
-    public IReadOnlyList<DcPhase> Strings { get; init; }
+    public Ac1Bus               Ac      { get; init; }
+    public IReadOnlyList<DcBus> Strings { get; init; }
 }
diff --git a/csharp/Lib/StatusApi/ThreePhaseInverterStatus.cs b/csharp/Lib/StatusApi/ThreePhaseInverterStatus.cs
index e9fe03d3c..c525a6a67 100644
--- a/csharp/Lib/StatusApi/ThreePhaseInverterStatus.cs
+++ b/csharp/Lib/StatusApi/ThreePhaseInverterStatus.cs
@@ -10,7 +10,7 @@ public partial record ThreePhaseInverterStatus :
     IAc3Connection,
     IDcConnection
 {
-    public Ac3Phase Ac { get; init; }
-    public DcPhase  Dc { get; init; }
+    public Ac3Bus Ac { get; init; }
+    public DcBus  Dc { get; init; }
 }
     
\ No newline at end of file
diff --git a/csharp/Lib/StatusApi/ThreePhasePvInverterStatus.cs b/csharp/Lib/StatusApi/ThreePhasePvInverterStatus.cs
index c2fb05d30..8c122ffb3 100644
--- a/csharp/Lib/StatusApi/ThreePhasePvInverterStatus.cs
+++ b/csharp/Lib/StatusApi/ThreePhasePvInverterStatus.cs
@@ -10,6 +10,6 @@ public partial record ThreePhasePvInverterStatus :
     IAc3Connection,
     IPvConnection
 {
-    public Ac3Phase               Ac      { get; init; }
-    public IReadOnlyList<DcPhase> Strings { get; init; }
+    public Ac3Bus               Ac      { get; init; }
+    public IReadOnlyList<DcBus> Strings { get; init; }
 }