diff --git a/Modelica/Electrical/Analog/Examples/CompareTransformers.mo b/Modelica/Electrical/Analog/Examples/CompareTransformers.mo
index 8a41e2fa23..e4786e47ce 100644
--- a/Modelica/Electrical/Analog/Examples/CompareTransformers.mo
+++ b/Modelica/Electrical/Analog/Examples/CompareTransformers.mo
@@ -10,15 +10,15 @@ model CompareTransformers
   parameter Real n=2 "Turns ratio primary:secondary voltage";
   parameter SI.Resistance R1=0.01
     "Primary resistance w.r.t. primary side";
-  parameter SI.Inductance L1sigma=0.05/(2*pi*f)
+  parameter SI.Inductance L1sigma=0.05'Ohm'/(2*pi*f)
     "Primary leakage inductance w.r.t. primary side";
-  parameter SI.Inductance Lm1= 10./(2*pi*f)
+  parameter SI.Inductance Lm1= 10'Ohm'/(2*pi*f)
     "Magnetizing inductance w.r.t. primary side";
-  parameter SI.Inductance L2sigma=0.05/(2*pi*f)/n^2
+  parameter SI.Inductance L2sigma=0.05'Ohm'/(2*pi*f)/n^2
     "Secondary leakage inductance w.r.t. secondary side";
-  parameter SI.Resistance R2=0.01/n^2
+  parameter SI.Resistance R2=0.01'Ohm'/n^2
     "Secondary resistance w.r.t. secondary side";
-  parameter SI.Resistance RL=1/n^2 "Load resistance";
+  parameter SI.Resistance RL=1'Ohm'/n^2 "Load resistance";
   final parameter SI.Inductance L1=L1sigma + M*n
     "Primary no-load inductance";
   final parameter SI.Inductance L2=L2sigma + M/n
diff --git a/Modelica/Electrical/Machines/BasicMachines/InductionMachines/IM_SlipRing.mo b/Modelica/Electrical/Machines/BasicMachines/InductionMachines/IM_SlipRing.mo
index 243c8b81b9..7da09e2c8f 100644
--- a/Modelica/Electrical/Machines/BasicMachines/InductionMachines/IM_SlipRing.mo
+++ b/Modelica/Electrical/Machines/BasicMachines/InductionMachines/IM_SlipRing.mo
@@ -51,7 +51,7 @@ model IM_SlipRing "Induction machine with slipring rotor"
   parameter SI.Voltage VsNominal(start=100)
     "Nominal stator voltage per phase"
     annotation (Dialog(enable=not useTurnsRatio));
-  parameter SI.Voltage VrLockedRotor(start=100*(2*pi*
+  parameter SI.Voltage VrLockedRotor(start=100'V'*(2*pi*
         fsNominal*Lm)/sqrt(Rs^2 + (2*pi*fsNominal*(Lm + Lssigma))^2))
     "Locked-rotor voltage per phase"
     annotation (Dialog(enable=not useTurnsRatio));
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
index 085ef79b15..f617c32565 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo
@@ -103,9 +103,9 @@ model IMC_InverterDrive
   parameter Utilities.ParameterRecords.IM_SquirrelCageData aimcData(
     Rs=0.03*16,
     Rr=0.04*16,
-    Lssigma=3*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16,
-    Lm=3*sqrt(1 - 0.0667)/(2*pi*aimcData.fsNominal)*16,
-    Lrsigma=3*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16) "Induction machine data"
+    Lssigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16,
+    Lm=3'Ohm'*sqrt(1 - 0.0667)/(2*pi*aimcData.fsNominal)*16,
+    Lrsigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/(2*pi*aimcData.fsNominal)*16) "Induction machine data"
     annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
   Modelica.Mechanics.Rotational.Components.Inertia loadInertia(J=JLoad)
     annotation (Placement(transformation(extent={{50,-40},{70,-20}})));
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
index 8608341cff..c795a22b0b 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_YDarc.mo
@@ -7,7 +7,7 @@ model IMC_YDarc "Test example: InductionMachineSquirrelCage Y-D"
     "Nominal RMS voltage per phase";
   parameter SI.Frequency fNominal=50 "Nominal frequency";
   parameter SI.Resistance RLine=0.0001 "Line resistance";
-  parameter SI.Inductance LLine=0.0001/(2*pi*fNominal) "Line inductance";
+  parameter SI.Inductance LLine=0.0001'Ohm'/(2*pi*fNominal) "Line inductance";
   parameter SI.Time tStart1=0.1 "Start time";
   parameter SI.Time tStart2=2.0 "Start time from Y to D";
   parameter SI.Torque TLoad=161.4 "Nominal load torque";
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
index 51516b0d45..db726ca99e 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMC_withLosses.mo
@@ -130,14 +130,14 @@ public
     Jr=0.12,
     Rs=0.56,
     alpha20s(displayUnit="1/K")=Modelica.Electrical.Machines.Thermal.Constants.alpha20Copper,
-    Lssigma=1.52/(2*pi*fNominal),
+    Lssigma=1.52'Ohm'/(2*pi*fNominal),
     frictionParameters(PRef=180, wRef=wNominal),
     strayLoadParameters(
       PRef=0.005*sqrt(3)*VNominal*INominal*pfNominal,
       IRef=INominal/sqrt(3),
       wRef=wNominal),
-    Lm=66.4/(2*pi*fNominal),
-    Lrsigma=2.31/(2*pi*fNominal),
+    Lm=66.4'Ohm'/(2*pi*fNominal),
+    Lrsigma=2.31'Ohm'/(2*pi*fNominal),
     Rr=0.42,
     alpha20r(displayUnit="1/K")=Modelica.Electrical.Machines.Thermal.Constants.alpha20Aluminium)   "Induction machine data"
     annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
diff --git a/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo b/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
index de88e27d8b..7afd784c0e 100644
--- a/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
+++ b/Modelica/Electrical/Machines/Examples/InductionMachines/IMS_Start.mo
@@ -6,7 +6,7 @@ model IMS_Start "Test example: InductionMachineSlipRing"
     "Nominal RMS voltage per phase";
   parameter SI.Frequency fNominal=50 "Nominal frequency";
   parameter SI.Time tStart1=0.1 "Start time";
-  parameter SI.Resistance Rstart=0.16/aimsData.turnsRatio^2
+  parameter SI.Resistance Rstart=0.16'Ohm'/aimsData.turnsRatio^2
     "Starting resistance";
   parameter SI.Time tStart2=1.0
     "Start time of shorting starting resistance";
diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SlipRingData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SlipRingData.mo
index d9d2fa4c16..0110e0d192 100644
--- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SlipRingData.mo
+++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SlipRingData.mo
@@ -3,10 +3,10 @@ record IM_SlipRingData
   "Common parameters for induction machines with slip ring"
   extends InductionMachineData;
   import Modelica.Constants.pi;
-  parameter SI.Inductance Lm=3*sqrt(1 - 0.0667)/(2*pi*
+  parameter SI.Inductance Lm=3'Ohm'*sqrt(1 - 0.0667)/(2*pi*
       fsNominal) "Stator main field inductance per phase"
     annotation (Dialog(tab="Nominal resistances and inductances"));
-  parameter SI.Inductance Lrsigma=3*(1 - sqrt(1 - 0.0667))/
+  parameter SI.Inductance Lrsigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/
       (2*pi*fsNominal)/turnsRatio^2
     "Rotor stray inductance per phase w.r.t. rotor side"
     annotation (Dialog(tab="Nominal resistances and inductances"));
@@ -16,7 +16,7 @@ record IM_SlipRingData
   parameter SI.Inductance Lrzero=Lrsigma/turnsRatio^2
     "Rotor zero sequence inductance w.r.t. rotor side"
     annotation (Dialog(tab="Nominal resistances and inductances"));
-  parameter SI.Resistance Rr=0.04/turnsRatio^2
+  parameter SI.Resistance Rr=0.04'Ohm'/turnsRatio^2
     "Rotor resistance per phase at TRef w.r.t. rotor side"
     annotation (Dialog(tab="Nominal resistances and inductances"));
   parameter SI.Temperature TrRef=293.15
@@ -35,7 +35,7 @@ record IM_SlipRingData
   parameter SI.Voltage VsNominal=100
     "Nominal stator voltage per phase"
     annotation (Dialog(enable=not useTurnsRatio));
-  parameter SI.Voltage VrLockedRotor=100*(2*pi*fsNominal*Lm)
+  parameter SI.Voltage VrLockedRotor=100'V'*(2*pi*fsNominal*Lm)
       /sqrt(Rs^2 + (2*pi*fsNominal*(Lm + Lssigma))^2)
     "Locked-rotor voltage per phase"
     annotation (Dialog(enable=not useTurnsRatio));
diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SquirrelCageData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SquirrelCageData.mo
index eed5c19435..e98f5ee25b 100644
--- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SquirrelCageData.mo
+++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/IM_SquirrelCageData.mo
@@ -3,10 +3,10 @@ record IM_SquirrelCageData
   "Common parameters for induction machines with squirrel cage"
   extends InductionMachineData;
   import Modelica.Constants.pi;
-  parameter SI.Inductance Lm=3*sqrt(1 - 0.0667)/(2*pi*
+  parameter SI.Inductance Lm=3'Ohm'*sqrt(1 - 0.0667)/(2*pi*
       fsNominal) "Stator main field inductance per phase"
     annotation (Dialog(tab="Nominal resistances and inductances"));
-  parameter SI.Inductance Lrsigma=3*(1 - sqrt(1 - 0.0667))/
+  parameter SI.Inductance Lrsigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/
       (2*pi*fsNominal)
     "Rotor stray inductance per phase (equivalent three-phase winding)"
     annotation (Dialog(tab="Nominal resistances and inductances"));
diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/InductionMachineData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/InductionMachineData.mo
index 542c27cfeb..730e671251 100644
--- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/InductionMachineData.mo
+++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/InductionMachineData.mo
@@ -20,7 +20,7 @@ record InductionMachineData "Common parameters for induction machines"
   parameter SI.Inductance Lszero=Lssigma
     "Stator zero sequence inductance"
     annotation (Dialog(tab="Nominal resistances and inductances"));
-  parameter SI.Inductance Lssigma=3*(1 - sqrt(1 - 0.0667))/
+  parameter SI.Inductance Lssigma=3'Ohm'*(1 - sqrt(1 - 0.0667))/
       (2*pi*fsNominal) "Stator stray inductance per phase"
     annotation (Dialog(tab="Nominal resistances and inductances"));
   parameter Real ratioCommonStatorLeakage(final min=0, final max=1)=1
diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ElectricalExcitedData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ElectricalExcitedData.mo
index e81593e010..904cb7db63 100644
--- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ElectricalExcitedData.mo
+++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ElectricalExcitedData.mo
@@ -1,7 +1,7 @@
 within Modelica.Electrical.Machines.Utilities.ParameterRecords;
 record SM_ElectricalExcitedData
   "Common parameters for synchronous machines with electrical excitation"
-  extends SM_ReluctanceRotorData(Lmd=1.5/(2*pi*fsNominal), Lmq=1.5/(2*pi*
+  extends SM_ReluctanceRotorData(Lmd=1.5'Ohm'/(2*pi*fsNominal), Lmq=1.5'Ohm'/(2*pi*
         fsNominal));
   import Modelica.Constants.pi;
   parameter SI.Voltage VsNominal=100
diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_PermanentMagnetData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_PermanentMagnetData.mo
index 8a019003bb..c77b122024 100644
--- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_PermanentMagnetData.mo
+++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_PermanentMagnetData.mo
@@ -1,7 +1,7 @@
 within Modelica.Electrical.Machines.Utilities.ParameterRecords;
 record SM_PermanentMagnetData
   "Common parameters for synchronous machines with permanent magnet"
-  extends SM_ReluctanceRotorData(Lmd=0.3/(2*pi*fsNominal), Lmq=0.3/(2*pi*
+  extends SM_ReluctanceRotorData(Lmd=0.3'Ohm'/(2*pi*fsNominal), Lmq=0.3'Ohm'/(2*pi*
         fsNominal));
   import Modelica.Constants.pi;
   parameter SI.Voltage VsOpenCircuit=112.3
diff --git a/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ReluctanceRotorData.mo b/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ReluctanceRotorData.mo
index 164a1cbe25..88b5a72245 100644
--- a/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ReluctanceRotorData.mo
+++ b/Modelica/Electrical/Machines/Utilities/ParameterRecords/SM_ReluctanceRotorData.mo
@@ -1,18 +1,18 @@
 within Modelica.Electrical.Machines.Utilities.ParameterRecords;
 record SM_ReluctanceRotorData
   "Common parameters for synchronous machines with reluctance rotor"
-  extends InductionMachineData(Lssigma=0.1/(2*pi*fsNominal));
+  extends InductionMachineData(Lssigma=0.1'Ohm'/(2*pi*fsNominal));
   import Modelica.Constants.pi;
-  parameter SI.Inductance Lmd=2.9/(2*pi*fsNominal)
+  parameter SI.Inductance Lmd=2.9'Ohm'/(2*pi*fsNominal)
     "Stator main field inductance per phase in d-axis"
     annotation (Dialog(tab="Nominal resistances and inductances"));
-  parameter SI.Inductance Lmq=0.9/(2*pi*fsNominal)
+  parameter SI.Inductance Lmq=0.9'Ohm'/(2*pi*fsNominal)
     "Stator main field inductance per phase in q-axis"
     annotation (Dialog(tab="Nominal resistances and inductances"));
   parameter Boolean useDamperCage=true "Enable / disable damper cage"
     annotation (Evaluate=true,Dialog(tab=
           "Nominal resistances and inductances", group="Damper cage"));
-  parameter SI.Inductance Lrsigmad=0.05/(2*pi*fsNominal)
+  parameter SI.Inductance Lrsigmad=0.05'Ohm'/(2*pi*fsNominal)
     "Damper stray inductance in d-axis" annotation (Dialog(
       tab="Nominal resistances and inductances",
       group="Damper cage",
diff --git a/Modelica/Electrical/Polyphase/Examples/TestSensors.mo b/Modelica/Electrical/Polyphase/Examples/TestSensors.mo
index 8c4476c357..46b3f27c97 100644
--- a/Modelica/Electrical/Polyphase/Examples/TestSensors.mo
+++ b/Modelica/Electrical/Polyphase/Examples/TestSensors.mo
@@ -7,7 +7,7 @@ model TestSensors
     "Nominal RMS voltage per phase";
   parameter SI.Frequency f=50 "Frequency";
   parameter SI.Resistance R=1/sqrt(2) "Load resistance";
-  parameter SI.Inductance L=1/sqrt(2)/(2*pi*f) "Load inductance";
+  parameter SI.Inductance L=1'Ohm'/sqrt(2)/(2*pi*f) "Load inductance";
   final parameter SI.Impedance Z=sqrt(R^2 + (2*pi*f*L)^2) "Load impedance";
   final parameter SI.Current IRMS=VRMS/Z "Steady state RMS current";
   final parameter SI.ActivePower P=3*R*IRMS^2 "Total active power";
diff --git a/Modelica/Electrical/QuasiStatic/Polyphase/Examples/TestSensors.mo b/Modelica/Electrical/QuasiStatic/Polyphase/Examples/TestSensors.mo
index 5c1c7ebe7c..c0810b05f5 100644
--- a/Modelica/Electrical/QuasiStatic/Polyphase/Examples/TestSensors.mo
+++ b/Modelica/Electrical/QuasiStatic/Polyphase/Examples/TestSensors.mo
@@ -7,7 +7,7 @@ model TestSensors
     "Nominal RMS voltage per phase";
   parameter SI.Frequency f=50 "Frequency";
   parameter SI.Resistance R=1/sqrt(2) "Load resistance";
-  parameter SI.Inductance L=1/sqrt(2)/(2*pi*f) "Load inductance";
+  parameter SI.Inductance L=1'Ohm'/sqrt(2)/(2*pi*f) "Load inductance";
   final parameter SI.Impedance Z=sqrt(R^2 + (2*pi*f*L)^2) "Load impedance";
   final parameter SI.Current IRMS=VRMS/Z "Steady state RMS current";
   final parameter SI.ActivePower P=3*R*IRMS^2 "Total active power";