diff --git a/IBPSA/Electrical/BaseClasses/PV/PartialPVSystem.mo b/IBPSA/Electrical/BaseClasses/PV/PartialPVSystem.mo
index 2404740181..33735bd03d 100644
--- a/IBPSA/Electrical/BaseClasses/PV/PartialPVSystem.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/PartialPVSystem.mo
@@ -130,7 +130,7 @@ partial model PartialPVSystem "Base PV model with internal or external MPP track
     "Zenith angle of irradiation"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}},
                                                                      rotation=0)));
-  replaceable Buildings.Electrical.Interfaces.Terminal terminal(
+  replaceable IBPSA.Electrical.Interfaces.Terminal terminal(
     redeclare final package PhaseSystem = PhaseSystem) if use_ter "Generalized terminal"
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 
diff --git a/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo b/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo
index 5a3098af8a..1827ae68a8 100644
--- a/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo
+++ b/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo
@@ -7,16 +7,16 @@ model PVSingleDiode "Example for the single-diode PV model"
       "modelica://IBPSA/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos")));
   Modelica.Electrical.Analog.Basic.Ground ground
     annotation (Placement(transformation(extent={{-56,-20},{-36,0}})));
-  Buildings.Electrical.DC.Loads.Resistor    res(R=0.5, V_nominal=12)
+  Loads.Resistor                            res(R=0.5, V_nominal=12)
     "Resistance"
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
-  Buildings.Electrical.DC.Sources.ConstantVoltage    sou(V=pVSys1Dio120Wp.dat.VOC0)
+  ConstantVoltage                                    sou(V=pVSys1Dio120Wp.dat.VOC0)
                                                                "Voltage source"
     annotation (Placement(transformation(extent={{-32,-10},{-12,10}})));
-  Buildings.Electrical.DC.Lines.TwoPortResistance lin(R=0.05)
+  Lines.TwoPortResistance                         lin(R=0.05)
     "Transmission line"
     annotation (Placement(transformation(extent={{6,40},{26,60}})));
-  Buildings.Electrical.DC.Sensors.GeneralizedSensor sen "Sensor"
+  Sensors.GeneralizedSensor                         sen "Sensor"
     annotation (Placement(transformation(extent={{34,40},{54,60}})));
   IBPSA.Electrical.DC.Sources.PVSingleDiode
                 pVSys1Dio120Wp(