diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Basic/BaseClasses/PartialLaminarRestriction.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Basic/BaseClasses/PartialLaminarRestriction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Basic/BaseClasses/PartialLaminarRestriction.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Basic/BaseClasses/PartialLaminarRestriction.mo"	2022-03-10 09:57:58.128146677 +0000
@@ -1,19 +1,19 @@
 within OpenHydraulics.Basic.BaseClasses;
 partial model PartialLaminarRestriction
   // the sizing parameters
-  parameter Modelica.SIunits.Diameter D(final min=0)= 0.01
+  parameter Modelica.Units.SI.Diameter D(final min=0)= 0.01
     "Hydraulic diameter of restriction (for computation of Re)"
     annotation(Dialog(tab="Sizing"));
 
   // advanced parameters
   parameter Boolean check_Re = false "true, check whether Re<Re_laminar"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
-  parameter Modelica.SIunits.ReynoldsNumber Re_laminar=2000
+  parameter Modelica.Units.SI.ReynoldsNumber Re_laminar=2000
     "Boundary of laminar flow regime"
     annotation(Dialog(tab="Advanced", enable=check_Re));
 
   // since Re is used only for diagnostics, do not generate events --> noEvent
-  Modelica.SIunits.ReynoldsNumber Re=noEvent(abs(port_a.m_flow))*4/(Modelica.Constants.pi
+  Modelica.Units.SI.ReynoldsNumber Re=noEvent(abs(port_a.m_flow))*4/(Modelica.Constants.pi
       *max(D, 1e-20)*eta) "Reynolds number";
 
   SI.DynamicViscosity eta = (oil.dynamicViscosity(p_a) +
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter.mo"	2022-03-10 09:57:57.568146606 +0000
@@ -18,7 +18,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position,
     q_nom=1e-4) annotation (Placement(transformation(extent={{42,38},{62,58}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
@@ -31,7 +31,7 @@
     annotation (Placement(transformation(extent={{68,38},{88,58}})));
   Modelica.Blocks.Sources.Sine sine(
     startTime=1,
-    freqHz=0.1,
+f    =0.1,
     amplitude=1)
     annotation (Placement(transformation(
         origin={80,-38},
@@ -63,7 +63,7 @@
     annotation (Placement(transformation(extent={{-64,-2},{-44,18}})));
 
   Modelica.Blocks.Sources.Sine sine1(
-    freqHz=0.1,
+    f =0.1,
     startTime=9,
     phase=5.02658,
     amplitude=1)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterForceVelocityControl.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterForceVelocityControl.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterForceVelocityControl.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterForceVelocityControl.mo"	2022-03-10 09:57:57.536146602 +0000
@@ -20,7 +20,7 @@
     s_init=0.1,
     fixHeadPressure=true,
     fixRodPressure=true,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity)
                 annotation (Placement(transformation(extent={{30,10},{48,30}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterSectionalValveCircuit.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterSectionalValveCircuit.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterSectionalValveCircuit.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenterSectionalValveCircuit.mo"	2022-03-10 09:57:57.508146599 +0000
@@ -44,7 +44,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position)
                 annotation (Placement(transformation(extent={{-48,0},{-28,20}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
@@ -59,7 +59,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position)
                 annotation (Placement(transformation(extent={{36,0},{56,20}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed1
@@ -69,7 +69,7 @@
     annotation (Placement(transformation(extent={{64,0},{84,20}})));
   Modelica.Blocks.Sources.Sine sine(
     startTime=0,
-    freqHz=0.1,
+f    =0.1,
     amplitude=1)
     annotation (Placement(transformation(extent={{-86,-36},{-66,-16}})));
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter_tandem.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter_tandem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter_tandem.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/OpenCenter_tandem.mo"	2022-03-10 09:57:57.460146592 +0000
@@ -15,7 +15,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position)
                 annotation (Placement(transformation(extent={{-68,48},{-48,68}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
@@ -27,7 +27,7 @@
     startTime=0,
     amplitude=1,
     offset=0,
-    freqHz=0.1)
+f    =0.1)
     annotation (Placement(transformation(
         origin={-10,88},
         extent={{-10,-10},{10,10}},
@@ -59,7 +59,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position)
                 annotation (Placement(transformation(extent={{20,48},{40,68}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed1
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensated.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensated.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensated.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensated.mo"	2022-03-10 09:57:57.428146588 +0000
@@ -14,14 +14,14 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position)
                 annotation (Placement(transformation(extent={{0,40},{20,60}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
     annotation (Placement(transformation(extent={{-20,38},{0,58}})));
   Modelica.Blocks.Sources.Sine sine(amplitude=1,
     startTime=0,
-    freqHz=0.1)
+f    =0.1)
     annotation (Placement(transformation(
         origin={60,10},
         extent={{-10,-10},{10,10}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensatedLoadSensing.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensatedLoadSensing.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensatedLoadSensing.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/PressureCompensatedLoadSensing.mo"	2022-03-10 09:57:57.400146584 +0000
@@ -15,7 +15,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position)
                 annotation (Placement(transformation(extent={{44,30},{64,50}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
@@ -23,7 +23,7 @@
   Modelica.Blocks.Sources.Sine sine(amplitude=1,
     startTime=1,
     phase=0,
-    freqHz=0.1)
+f    =0.1)
     annotation (Placement(transformation(extent={{10,-82},{30,-62}})));
   OpenHydraulics.Components.MotorsPumps.PCLSPump PCLSPump(Dmax=0.00004)
     annotation (Placement(transformation(extent={{-58,-32},{-38,-12}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/Regenerative.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/Regenerative.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/Regenerative.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Circuits/Regenerative.mo"	2022-03-10 09:57:57.360146579 +0000
@@ -16,7 +16,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position,
     q_nom=1e-4,
     strokeLength=0.5)
                 annotation (Placement(transformation(extent={{44,30},{64,50}})));
@@ -27,7 +27,7 @@
                                                            m=1000)
     annotation (Placement(transformation(extent={{70,30},{90,50}})));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=0.1,
+    f =0.1,
     amplitude=1,
     startTime=0)
     annotation (Placement(transformation(extent={{0,-80},{20,-60}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/BaseClasses/CylinderCushion.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/BaseClasses/CylinderCushion.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/BaseClasses/CylinderCushion.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/BaseClasses/CylinderCushion.mo"	2022-03-10 09:57:57.320146575 +0000
@@ -52,7 +52,7 @@
         origin={60,-30},
         extent={{-10,-10},{10,10}},
         rotation=270)));
-  Modelica.Blocks.Tables.CombiTable1D cushionTableBlock(
+  Modelica.Blocks.Tables.CombiTable1Dv cushionTableBlock(
     table=cushionTable,
     columns=2:2,
     smoothness=smoothness)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/DoubleActingCylinder.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/DoubleActingCylinder.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/DoubleActingCylinder.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Cylinders/DoubleActingCylinder.mo"	2022-03-10 09:57:57.288146571 +0000
@@ -80,8 +80,8 @@
     annotation (Dialog(tab="Seals",group="Piston"));
 
   // initialization parameters
-  parameter Modelica.Mechanics.MultiBody.Types.Init initType=
-      Modelica.Mechanics.MultiBody.Types.Init.Free
+  parameter ObsoleteModelica4.Mechanics.MultiBody.Types.Init initType=
+      ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Free
     "Type of initialization (defines usage of start values below)"
     annotation (Dialog(tab="Initialization",group="Mechanical"));
   parameter SI.Distance s_init = 0 "Initial position >0 and <stroke"
@@ -195,24 +195,24 @@
   assert(cylinderChamberRod.s_rel>=0,"Initial position is larger than strokeLength");
 
   // state initialization
-  if initType == Modelica.Mechanics.MultiBody.Types.Init.Position then
+  if initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position then
     cylinderChamberHead.s_rel = s_init;
-  elseif initType == Modelica.Mechanics.MultiBody.Types.Init.Velocity then
+  elseif initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Velocity then
     cylinderChamberHead.v_rel = v_init;
-  elseif initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity then
+  elseif initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity then
     cylinderChamberHead.s_rel = s_init;
     cylinderChamberHead.v_rel = v_init;
-  elseif initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration then
+  elseif initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration then
     cylinderChamberHead.v_rel = v_init;
     piston.a = a_init;
-  elseif initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState then
+  elseif initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState then
     cylinderChamberHead.v_rel = 0;
     piston.a = a_init;
-  elseif initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then
+  elseif initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then
     cylinderChamberHead.s_rel = s_init;
     cylinderChamberHead.v_rel = v_init;
     piston.a = a_init;
-  elseif initType == Modelica.Mechanics.MultiBody.Types.Init.Free then
+  elseif initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Free then
     // nothing
   else
     assert(true,"Invalid initialization type in FluidPower2MechTrans");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPump.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPump.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPump.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPump.mo"	2022-03-10 09:57:57.028146538 +0000
@@ -62,7 +62,7 @@
     k=propGain,
     Td=timeConst,
     final yMin=0,
-    initType=Modelica.Blocks.Types.InitPID.InitialState)
+    initType=Modelica.Blocks.Types.Init.InitialState)
     annotation (Placement(transformation(extent={{0,-36},{20,-16}})));
   Sensors.PressureSensor pressureSensorLS
     annotation (Placement(transformation(extent={{-90,-42},{-70,-22}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPumpSignalControlled.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPumpSignalControlled.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPumpSignalControlled.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/MotorsPumps/PCLSPumpSignalControlled.mo"	2022-03-10 09:57:56.980146531 +0000
@@ -62,7 +62,7 @@
     k=propGain,
     Td=timeConst,
     final yMin=0,
-    initType=Modelica.Blocks.Types.InitPID.InitialState)
+    initType=Modelica.Blocks.Types.Init.InitialState)
     annotation (Placement(transformation(extent={{0,-36},{20,-16}})));
   Modelica.Blocks.Math.Add desiredPressure
     annotation (Placement(transformation(extent={{-30,-36},{-10,-16}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Sensors/FVController.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Sensors/FVController.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Sensors/FVController.mo"	2022-03-10 09:57:37.372144047 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Sensors/FVController.mo"	2022-03-10 09:57:56.896146521 +0000
@@ -13,7 +13,7 @@
         19,-8000; 20,-5000; 21,-1000; 22,100; 23,0; 24,0])
     annotation (                                    Dialog, Placement(
         transformation(extent={{0,60},{-20,80}})));
-  Modelica.Blocks.Sources.Clock clock
+  Modelica.Blocks.Sources.ContinuousClock clock
     annotation (Placement(transformation(
         origin={20,90},
         extent={{-10,-10},{10,10}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/DirectionalValves/V4_3CCRegenerative.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/DirectionalValves/V4_3CCRegenerative.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/DirectionalValves/V4_3CCRegenerative.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/DirectionalValves/V4_3CCRegenerative.mo"	2022-03-10 09:57:56.384146457 +0000
@@ -14,7 +14,7 @@
     annotation(Dialog(tab="Sizing",group="Advanced Metering"));
   parameter Real dampCoeff = 1 "Damping coefficient of 2nd order response"
     annotation(Dialog(tab="Dynamics"));
-  parameter Modelica.SIunits.Frequency bandwidth=100
+  parameter Modelica.Units.SI.Frequency bandwidth=100
     "Bandwidth of 2nd order response"
     annotation(Dialog(tab="Dynamics"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/PostPCValve.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/PostPCValve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/PostPCValve.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Components/Valves/PostPCValve.mo"	2022-03-10 09:57:56.212146433 +0000
@@ -1,8 +1,8 @@
 within OpenHydraulics.Components.Valves;
 model PostPCValve "Simple equation model for a post PC valve"
   // sizing parameters
-  parameter Modelica.SIunits.Pressure p_margin=100000;
-  parameter Modelica.SIunits.Density d_nom=850 "Nominal density"
+  parameter Modelica.Units.SI.Pressure p_margin=100000;
+  parameter Modelica.Units.SI.Density d_nom=850 "Nominal density"
     annotation (Dialog(tab="Sizing"));
   extends OpenHydraulics.Interfaces.PartialFluidComponent;
 public
@@ -14,15 +14,15 @@
   parameter Boolean use_Re = false
     "= true, if turbulent region is defined by Re, otherwise by dp_small or m_flow_small"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
-  parameter Modelica.SIunits.AbsolutePressure dp_small=1
+  parameter Modelica.Units.SI.AbsolutePressure dp_small=1
     "Turbulent flow if |dp| >= dp_small"
     annotation(Dialog(tab="Advanced", enable=not use_Re and from_dp));
-  parameter Modelica.SIunits.MassFlowRate m_flow_small=0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small=0.01
     "Turbulent flow if |m_flow| >= m_flow_small"
     annotation(Dialog(tab="Advanced", enable=not use_Re and not from_dp));
 
   // main variables
-  Modelica.SIunits.Pressure dp=port_a.p - port_b.p
+  Modelica.Units.SI.Pressure dp=port_a.p - port_b.p
     "Pressure drop from port_a to port_b";
   // the connectors
   OpenHydraulics.Interfaces.FluidPort port_a
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTest.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTest.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTest.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTest.mo"	2022-03-10 09:57:56.000146408 +0000
@@ -33,7 +33,7 @@
         extent={{-10,-10},{10,10}},
         rotation=270)));
   Modelica.Blocks.Sources.Sine sinusoid1(
-    freqHz=0.5,
+    f =0.5,
     amplitude=1,
     startTime=0)
     annotation (Placement(transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTestSimple.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTestSimple.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTestSimple.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DirectionalValveTestSimple.mo"	2022-03-10 09:57:55.988146405 +0000
@@ -18,7 +18,7 @@
     rodDiameter=0.03,
     pistonMass=0.3,
     s_init=0.1,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration)
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration)
                 annotation (Placement(transformation(extent={{20,42},{40,62}})));
 
   Modelica.Mechanics.Translational.Components.Fixed fixed
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleActingCylinderTestSimple2.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleActingCylinderTestSimple2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleActingCylinderTestSimple2.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleActingCylinderTestSimple2.mo"	2022-03-10 09:57:55.944146400 +0000
@@ -7,7 +7,7 @@
   Modelica.Mechanics.Translational.Components.Fixed fixed
     annotation (Placement(transformation(extent={{-22,40},{-2,60}})));
   OpenHydraulics.Components.Cylinders.DoubleActingCylinder doubleActingCylinder(
-    initType=Modelica.Mechanics.MultiBody.Types.Init.Position,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position,
     strokeLength=0.2,
     pistonMass=0.1,
     s_init=0.185,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleChamberTest.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleChamberTest.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleChamberTest.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/DoubleChamberTest.mo"	2022-03-10 09:57:55.924146398 +0000
@@ -19,7 +19,7 @@
     strokeLength=2,
     closedLength=3,
     damping=0,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity,
     v_init=-0.1)    annotation (Placement(transformation(extent={{-22,40},{-2,
             60}})));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTest.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTest.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTest.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTest.mo"	2022-03-10 09:57:55.916146396 +0000
@@ -16,7 +16,7 @@
         rotation=90)));
   Modelica.Blocks.Sources.Sine sinusoid(
     startTime=0.01,
-    freqHz=0.5,
+f    =0.5,
     amplitude=10)
     annotation (Placement(transformation(extent={{-94,-10},{-74,10}})));
   OpenHydraulics.Components.Volumes.CircuitTank circuitTank(V_max=2000,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTestOpenTank.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTestOpenTank.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTestOpenTank.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/GenericRestrictionTestOpenTank.mo"	2022-03-10 09:57:55.904146396 +0000
@@ -15,7 +15,7 @@
         rotation=90)));
   Modelica.Blocks.Sources.Sine sinusoid(
     startTime=0.01,
-    freqHz=0.5,
+f    =0.5,
     amplitude=10)
     annotation (Placement(transformation(extent={{-94,-10},{-74,10}})));
   Modelica.Mechanics.Rotational.Sources.Torque torque
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/LossyPumpTestSimple.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/LossyPumpTestSimple.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/LossyPumpTestSimple.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/LossyPumpTestSimple.mo"	2022-03-10 09:57:55.888146393 +0000
@@ -15,7 +15,7 @@
         extent={{10,10},{-10,-10}},
         rotation=180)));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=0.01,
+    f =0.01,
     amplitude=3e5,
     offset=4e5)
             annotation (Placement(transformation(extent={{80,-40},{60,-20}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/PumpTestSimple.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/PumpTestSimple.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/PumpTestSimple.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/PumpTestSimple.mo"	2022-03-10 09:57:55.844146387 +0000
@@ -15,7 +15,7 @@
         extent={{10,10},{-10,-10}},
         rotation=180)));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=0.01,
+    f =0.01,
     amplitude=0.4,
     offset=0.6)
             annotation (Placement(transformation(extent={{76,-28},{56,-8}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/WallFrictionTest.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/WallFrictionTest.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/WallFrictionTest.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/DevelopmentTests/WallFrictionTest.mo"	2022-03-10 09:57:55.736146373 +0000
@@ -15,7 +15,7 @@
         rotation=270)));
   Modelica.Blocks.Sources.Sine sinusoid(
     startTime=0.01,
-    freqHz=0.5,
+f    =0.5,
     amplitude=10)
     annotation (Placement(transformation(extent={{-94,-10},{-74,10}})));
   OpenHydraulics.Components.Volumes.CircuitTank circuitTank(V_max=2000,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/DigCycleSimulation.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/DigCycleSimulation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/DigCycleSimulation.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/DigCycleSimulation.mo"	2022-03-10 09:57:55.716146372 +0000
@@ -4,7 +4,7 @@
 
   SubSystems.MechanicsBody_noFriction mechanicsBody(
     swing_phi_start=0,
-    swing_initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity,
+    swing_initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity,
     boom_phi_start=0.87266462599716,
     arm_phi_start=-1.3962634015955,
     bucket_phi_start=0.34906585039887)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/DigCycleSeq.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/DigCycleSeq.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/DigCycleSeq.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/DigCycleSeq.mo"	2022-03-10 09:57:55.652146364 +0000
@@ -3,8 +3,8 @@
   import Modelica.Constants.pi;
 
   // the parameters
-  parameter Modelica.SIunits.Frequency bandwidth=10;
-  parameter Modelica.SIunits.Time startTime=1
+  parameter Modelica.Units.SI.Frequency bandwidth=10;
+  parameter Modelica.Units.SI.Time startTime=1
     "Time before excavator starts moving";
   parameter Real swingAmplitude = -1 "Amplitude of swing command";
   parameter Real boomAmplitude1 = -0.9 "Amplitude of first boom command";
@@ -17,27 +17,27 @@
   parameter Real bucketAmplitude3 = -1 "Amplitude of bucket command";
 
   // the components
-  Modelica.Blocks.Tables.CombiTable1D swingTimeTable(                   table=[0,
+  Modelica.Blocks.Tables.CombiTable1Dv swingTimeTable(                   table=[0,
         0; 1,0; 13,0; 14,swingAmplitude; 17,swingAmplitude; 18,0; 20,0])
     annotation (Placement(transformation(
         origin={-30,60},
         extent={{10,-10},{-10,10}},
         rotation=180)));
-  Modelica.Blocks.Tables.CombiTable1D boomTimeTable(
+  Modelica.Blocks.Tables.CombiTable1Dv boomTimeTable(
                            table=[0,0; 1,boomAmplitude1; 2,boomAmplitude1;
         3,0; 7,0; 8,boomAmplitude2; 11.5,boomAmplitude2; 12.5,0; 20,0])
     annotation (Placement(transformation(
         origin={-30,20},
         extent={{10,-10},{-10,10}},
         rotation=180)));
-  Modelica.Blocks.Tables.CombiTable1D armTimeTable(table=[0,0;0.5,0; 1,
+  Modelica.Blocks.Tables.CombiTable1Dv armTimeTable(table=[0,0;0.5,0; 1,
         armAmplitude1; 2,armAmplitude1; 3,0; 4.5,armAmplitude2; 6.5,
         armAmplitude2; 7.5,0; 20,0])
     annotation (Placement(transformation(
         origin={-30,-20},
         extent={{10,-10},{-10,10}},
         rotation=180)));
-  Modelica.Blocks.Tables.CombiTable1D bucketTimeTable(table=[0,0;0.5,0; 1,bucketAmplitude1; 3,bucketAmplitude1; 4,
+  Modelica.Blocks.Tables.CombiTable1Dv bucketTimeTable(table=[0,0;0.5,0; 1,bucketAmplitude1; 3,bucketAmplitude1; 4,
         0; 5,0; 6,bucketAmplitude2; 7,bucketAmplitude2; 9,0; 16,0; 16.3,
         bucketAmplitude3; 17,bucketAmplitude3; 18,0; 20,0])
     annotation (Placement(transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/HydraulicsSubSyst.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/HydraulicsSubSyst.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/HydraulicsSubSyst.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/HydraulicsSubSyst.mo"	2022-03-10 09:57:55.624146359 +0000
@@ -3,13 +3,13 @@
   extends OpenHydraulics.Interfaces.PartialFluidCircuit;
 
   //parameter SI.
-  parameter Modelica.SIunits.Length boom_s_init=1.19
+  parameter Modelica.Units.SI.Length boom_s_init=1.19
     "Initial position of boom cylinder"
     annotation(Dialog(tab="Initialization",group="Actuator Positions"));
-  parameter Modelica.SIunits.Length arm_s_init=0.71
+  parameter Modelica.Units.SI.Length arm_s_init=0.71
     "Initial position of arm cylinder"
     annotation(Dialog(tab="Initialization",group="Actuator Positions"));
-  parameter Modelica.SIunits.Length bucket_s_init=0.77
+  parameter Modelica.Units.SI.Length bucket_s_init=0.77
     "Initial position of bucket cylinder"
     annotation(Dialog(tab="Initialization",group="Actuator Positions"));
 
@@ -20,7 +20,7 @@
     rodDiameter=0.05,
     pistonMass=10,
     s_init=boom_s_init,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration,
     fixRodPressure=true,
     strokeLength=1.25)
     annotation (Placement(transformation(extent={{-38,50},{-18,70}})));
@@ -44,7 +44,7 @@
     rodDiameter=0.05,
     pistonMass=10,
     s_init=arm_s_init,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration,
     fixHeadPressure=true)
     annotation (Placement(transformation(extent={{16,50},{36,70}})));
 
@@ -54,7 +54,7 @@
     rodDiameter=0.05,
     s_init=bucket_s_init,
     pistonMass=5,
-    initType=Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration,
+    initType=ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration,
     fixRodPressure=true,
     strokeLength=0.9)
     annotation (Placement(transformation(extent={{56,50},{76,70}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/MechanicsBody_noFriction.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/MechanicsBody_noFriction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/MechanicsBody_noFriction.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Examples/Excavator/SubSystems/MechanicsBody_noFriction.mo"	2022-03-10 09:57:55.536146348 +0000
@@ -3,8 +3,8 @@
   import MB = Modelica.Mechanics.MultiBody;
 
   // the swing parameters
-  parameter Modelica.Mechanics.MultiBody.Types.Init swing_initType=
-      Modelica.Mechanics.MultiBody.Types.Init.Free
+  parameter ObsoleteModelica4.Mechanics.MultiBody.Types.Init swing_initType=
+      ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Free
     "Type of initialization (defines usage of start values below)"
     annotation (Dialog(group="Swing",tab="Initialization"));
   parameter SI.Angle
@@ -21,8 +21,8 @@
     annotation (Evaluate=false, Dialog(group="Swing",tab="Initialization"));
 
   // the boom parameters
-  parameter Modelica.Mechanics.MultiBody.Types.Init boom_initType=
-      Modelica.Mechanics.MultiBody.Types.Init.Free
+  parameter ObsoleteModelica4.Mechanics.MultiBody.Types.Init boom_initType=
+      ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Free
     "Type of initialization (defines usage of start values below)"
     annotation (Dialog(group="Boom",tab="Initialization"));
   parameter SI.Angle
@@ -39,8 +39,8 @@
     annotation (Evaluate=false, Dialog(group="Boom",tab="Initialization"));
 
   // the arm parameters
-  parameter Modelica.Mechanics.MultiBody.Types.Init arm_initType=
-      Modelica.Mechanics.MultiBody.Types.Init.Free
+  parameter ObsoleteModelica4.Mechanics.MultiBody.Types.Init arm_initType=
+      ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Free
     "Type of initialization (defines usage of start values below)"
     annotation (Dialog(group="Arm",tab="Initialization"));
   parameter SI.Angle
@@ -56,8 +56,8 @@
     annotation (Evaluate=false, Dialog(group="Arm",tab="Initialization"));
 
   // the bucket parameters
-  parameter Modelica.Mechanics.MultiBody.Types.Init bucket_initType=
-      Modelica.Mechanics.MultiBody.Types.Init.Free
+  parameter ObsoleteModelica4.Mechanics.MultiBody.Types.Init bucket_initType=
+      ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Free
     "Type of initialization (defines usage of start values below)"
     annotation (Dialog(group="Bucket",tab="Initialization"));
   parameter SI.Angle
@@ -79,15 +79,10 @@
   Modelica.Mechanics.MultiBody.Joints.Revolute swingRevolute(
     n={0,1,0},
     useAxisFlange=true,
-    a(start=swing_a_start, fixed=if ((
-          swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or (swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or (
-          swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false),
-    phi(fixed=if ((swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or (swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.Position or (
-          swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=
+    a(start=swing_a_start, fixed=if swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false),
+    phi(fixed=if swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=
           swing_phi_start),
-    w(fixed=if ((swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or (swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or (
-          swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.Velocity or (swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or (
-          swing_initType) == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=
+    w(fixed=if swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Velocity or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or swing_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=
           swing_w_start))
     "revolute joint (plus motor) representing the swing function"
     annotation (Placement(transformation(
@@ -95,36 +90,21 @@
         extent={{-10,-10},{10,10}},
         rotation=90)));
   Modelica.Mechanics.MultiBody.Joints.Revolute boomRevolute(
-    a(start=boom_a_start, fixed=if (
-          boom_initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or boom_initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or boom_initType
-           == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false),
-    phi(fixed=if (boom_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or boom_initType == Modelica.Mechanics.MultiBody.Types.Init.Position or
-          boom_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=
+    a(start=boom_a_start, fixed=if boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false),
+    phi(fixed=if boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=
           boom_phi_start),
-    w(fixed=if (boom_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or boom_initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or
-          boom_initType == Modelica.Mechanics.MultiBody.Types.Init.Velocity or boom_initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or boom_initType
-           == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=boom_w_start))
+    w(fixed=if boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Velocity or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or boom_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=boom_w_start))
     annotation (Placement(transformation(extent={{-133,12},{-113,32}})));
   Modelica.Mechanics.MultiBody.Joints.Revolute armRevolute(
-    a(start=arm_a_start, fixed=if (
-          arm_initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or arm_initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or arm_initType ==
-          Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false),
-    phi(fixed=if (arm_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or arm_initType == Modelica.Mechanics.MultiBody.Types.Init.Position or
-          arm_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=arm_phi_start),
-    w(fixed=if (arm_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or arm_initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or
-          arm_initType == Modelica.Mechanics.MultiBody.Types.Init.Velocity or arm_initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or arm_initType ==
-          Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=arm_w_start))
+    a(start=arm_a_start, fixed=if arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false),
+    phi(fixed=if arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=arm_phi_start),
+    w(fixed=if arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Velocity or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or arm_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=arm_w_start))
     annotation (Placement(transformation(extent={{3,12},{23,32}})));
   Modelica.Mechanics.MultiBody.Joints.Revolute bucketRevolute(
-    a(start=bucket_a_start, fixed=if (
-          bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or
-          bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false),
-    phi(fixed=if (bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.Position or
-          bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=
+    a(start=bucket_a_start, fixed=if bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false),
+    phi(fixed=if bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Position or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=
           bucket_phi_start),
-    w(fixed=if (bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocity or bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.SteadyState or
-          bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.Velocity or bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.VelocityAcceleration or
-          bucket_initType == Modelica.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration) then true else false, start=
+    w(fixed=if bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocity or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.SteadyState or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.Velocity or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.VelocityAcceleration or bucket_initType == ObsoleteModelica4.Mechanics.MultiBody.Types.Init.PositionVelocityAcceleration then true else false, start=
           bucket_w_start))
     annotation (Placement(transformation(extent={{159,12},{179,32}})));
   MB.Joints.Assemblies.JointRRR jointRRR1(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Utilities/package.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Utilities/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Utilities/package.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/Utilities/package.mo"	2022-03-10 09:57:55.000146280 +0000
@@ -1,6 +1,7 @@
 within OpenHydraulics;
 package Utilities "Utility models to construct fluid components (should not be used directly) "
-  extends Modelica.Icons.Library;
+  extends Modelica.Icons.Package;
+
 
 
   annotation (Documentation(info="<html>
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/openmodelica.metadata.json"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/openmodelica.metadata.json"	2022-03-10 09:57:58.184146685 +0000
@@ -1 +1 @@
-{"path":"OpenHydraulics", "sha":"3485cf4ae0449f1a76af737b7705879f8f08c14f", "support":"noSupport", "uses":{"Modelica":"3.2.0"}, "version":"1.0.0-master", "zipfile":"https://github.com/cparedis/OpenHydraulics/archive/3485cf4ae0449f1a76af737b7705879f8f08c14f.zip"}
+{"path": "OpenHydraulics", "sha": "3485cf4ae0449f1a76af737b7705879f8f08c14f", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "1.0.0-master", "zipfile": "https://github.com/cparedis/OpenHydraulics/archive/3485cf4ae0449f1a76af737b7705879f8f08c14f.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"}
\ No newline at end of file
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/package.mo" "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/package.mo"	2022-03-10 09:57:37.376144046 +0000
+++ "converted-libraries/.openmodelica/libraries/OpenHydraulics 1.0.0-master/package.mo"	2022-03-10 09:57:58.180146683 +0000
@@ -1,9 +1,9 @@
 within ;
 package OpenHydraulics "A free Modelica library that can be used to model hydraulic components and circuits."
   extends Modelica.Icons.Package;
-import SI = Modelica.SIunits;
-import Cv = Modelica.SIunits.Conversions;
-import NonSI = Modelica.SIunits.Conversions.NonSIunits;
+import Modelica.Units.SI;
+import Cv = Modelica.Units.Conversions;
+import Modelica.Units.NonSI;
 
 
 
@@ -15,12 +15,20 @@
 
 
 
+  
+
+
+
+
+
+
+
   annotation (
   version="1.0",
   versionDate="2013-02-19",
   preferedView="info",
   Settings(NewStateSelection=true),
-  uses(Modelica(version="3.2")),
+  uses(Modelica(version= "4.0.0")),
   classOrder={"UsersGuide","Examples","Environment", "BasicModels","Components","Circuits","Fluids","Icons",
       "TemporaryTests", "*"});
 end OpenHydraulics;