diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_SimpleHouse.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
similarity index 75%
rename from IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_SimpleHouse.txt
rename to IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
index 7150f143e5..c7c87ba983 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_SimpleHouse.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
@@ -12,7 +12,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.1536e+07]
-zone.T=[2.931499938964844e+02, 2.938165893554688e+02, 2.948394775390625e+02, 2.951160888671875e+02, 2.933800964355469e+02, 2.949007263183594e+02, 2.937331848144531e+02, 2.949746704101562e+02, 2.94963623046875e+02, 2.944449768066406e+02, 2.949704284667969e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951320190429688e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.94181396484375e+02, 2.951331481933594e+02, 2.93716552734375e+02, 2.932184143066406e+02, 2.950964050292969e+02, 2.934932556152344e+02, 2.940997009277344e+02, 2.96098876953125e+02, 2.970375061035156e+02, 2.962566223144531e+02, 2.963293762207031e+02, 2.957511291503906e+02, 2.968561096191406e+02, 2.973106079101562e+02, 2.972330017089844e+02, 2.974053955078125e+02, 2.972986145019531e+02, 2.974791564941406e+02, 2.975252075195312e+02, 2.975371398925781e+02, 2.97523681640625e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974816284179688e+02, 2.975858459472656e+02, 2.975862426757812e+02, 2.97521728515625e+02, 2.975988159179688e+02, 2.974871520996094e+02, 2.975801086425781e+02, 2.97568115234375e+02, 2.975059204101562e+02, 2.975872802734375e+02, 2.97644775390625e+02, 2.975877075195312e+02, 2.975962524414062e+02, 2.976087341308594e+02, 2.975819396972656e+02, 2.975243835449219e+02, 2.975371398925781e+02, 2.974706420898438e+02, 2.975225830078125e+02, 2.975242614746094e+02, 2.97474609375e+02, 2.974830017089844e+02, 2.974789428710938e+02, 2.974937438964844e+02, 2.974887390136719e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668029785156e+02, 2.966719360351562e+02, 2.971568603515625e+02, 2.972576599121094e+02, 2.966737670898438e+02, 2.959289245605469e+02, 2.957213745117188e+02, 2.9481201171875e+02, 2.944169616699219e+02, 2.947103271484375e+02, 2.939195556640625e+02, 2.940602722167969e+02, 2.940169677734375e+02, 2.937295227050781e+02, 2.931671142578125e+02, 2.933880310058594e+02, 2.950133056640625e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122131347656e+02, 2.931902465820312e+02, 2.951495361328125e+02, 2.950298767089844e+02, 2.942200012207031e+02, 2.936318054199219e+02, 2.943542785644531e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932530822753906e+02]
+zon.T=[2.931499938964844e+02, 2.938165893554688e+02, 2.948394775390625e+02, 2.951160888671875e+02, 2.933800964355469e+02, 2.949007263183594e+02, 2.937331848144531e+02, 2.949746704101562e+02, 2.94963623046875e+02, 2.944449768066406e+02, 2.949704284667969e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951320190429688e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.94181396484375e+02, 2.951331481933594e+02, 2.93716552734375e+02, 2.932184143066406e+02, 2.950964050292969e+02, 2.934932556152344e+02, 2.940997009277344e+02, 2.96098876953125e+02, 2.970375061035156e+02, 2.962566223144531e+02, 2.963293762207031e+02, 2.957511291503906e+02, 2.968561096191406e+02, 2.973106079101562e+02, 2.972330017089844e+02, 2.974053955078125e+02, 2.972986145019531e+02, 2.974791564941406e+02, 2.975252075195312e+02, 2.975371398925781e+02, 2.97523681640625e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974816284179688e+02, 2.975858459472656e+02, 2.975862426757812e+02, 2.97521728515625e+02, 2.975988159179688e+02, 2.974871520996094e+02, 2.975801086425781e+02, 2.97568115234375e+02, 2.975059204101562e+02, 2.975872802734375e+02, 2.97644775390625e+02, 2.975877075195312e+02, 2.975962524414062e+02, 2.976087341308594e+02, 2.975819396972656e+02, 2.975243835449219e+02, 2.975371398925781e+02, 2.974706420898438e+02, 2.975225830078125e+02, 2.975242614746094e+02, 2.97474609375e+02, 2.974830017089844e+02, 2.974789428710938e+02, 2.974937438964844e+02, 2.974887390136719e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668029785156e+02, 2.966719360351562e+02, 2.971568603515625e+02, 2.972576599121094e+02, 2.966737670898438e+02, 2.959289245605469e+02, 2.957213745117188e+02, 2.9481201171875e+02, 2.944169616699219e+02, 2.947103271484375e+02, 2.939195556640625e+02, 2.940602722167969e+02, 2.940169677734375e+02, 2.937295227050781e+02, 2.931671142578125e+02, 2.933880310058594e+02, 2.950133056640625e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122131347656e+02, 2.931902465820312e+02, 2.951495361328125e+02, 2.950298767089844e+02, 2.942200012207031e+02, 2.936318054199219e+02, 2.943542785644531e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932530822753906e+02]
 heaWat.u=[1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00]
 vavDam.y=[2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.554025948047638e-01, 2.5e-01, 3.29160213470459e-01, 3.752192556858063e-01, 3.871423006057739e-01, 3.736800849437714e-01, 4.329911172389984e-01, 3.599009811878204e-01, 3.316185176372528e-01, 4.358335733413696e-01, 4.362431168556213e-01, 3.717152774333954e-01, 4.48826789855957e-01, 3.371655642986298e-01, 4.301155805587769e-01, 4.181102514266968e-01, 3.559122383594513e-01, 4.37283456325531e-01, 4.947710633277893e-01, 4.377006590366364e-01, 4.462576806545258e-01, 4.58719402551651e-01, 4.31939035654068e-01, 3.743763864040375e-01, 3.871388733386993e-01, 3.206299543380737e-01, 3.725927770137787e-01, 3.742593824863434e-01, 3.246186673641205e-01, 3.33006888628006e-01, 3.289314806461334e-01, 3.437333405017853e-01, 3.387492895126343e-01, 2.950859367847443e-01, 2.619776129722595e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
 fan.sta_a.T=[2.883200073242188e+02, 2.90562744140625e+02, 2.883319396972656e+02, 2.920919799804688e+02, 2.906665649414062e+02, 2.918930969238281e+02, 2.898759155273438e+02, 2.901109619140625e+02, 2.89111572265625e+02, 2.908656616210938e+02, 2.898673706054688e+02, 2.899195861816406e+02, 2.912050170898438e+02, 2.915523681640625e+02, 2.904037475585938e+02, 2.919996948242188e+02, 2.906729431152344e+02, 2.909330749511719e+02, 2.910764465332031e+02, 2.914588623046875e+02, 2.901047668457031e+02, 2.916375122070312e+02, 2.910815734863281e+02, 2.919293212890625e+02, 2.92504638671875e+02, 2.907031555175781e+02, 2.918236694335938e+02, 2.916273803710938e+02, 2.919345703125e+02, 2.964934997558594e+02, 2.946243896484375e+02, 2.942006225585938e+02, 2.941107788085938e+02, 2.946829528808594e+02, 2.956533813476562e+02, 2.953515014648438e+02, 2.958345642089844e+02, 2.946706848144531e+02, 2.963741760253906e+02, 2.969334106445312e+02, 2.952789306640625e+02, 2.982248229980469e+02, 2.966036376953125e+02, 2.979476318359375e+02, 2.962223205566406e+02, 2.965768737792969e+02, 2.962604675292969e+02, 2.985108032226562e+02, 2.948568725585938e+02, 2.9739111328125e+02, 2.97256591796875e+02, 2.973014831542969e+02, 2.968691101074219e+02, 2.978995361328125e+02, 2.976356811523438e+02, 2.979755554199219e+02, 2.981031188964844e+02, 2.967643127441406e+02, 2.979931640625e+02, 2.976788024902344e+02, 2.957882080078125e+02, 2.974443054199219e+02, 2.967668151855469e+02, 2.963309020996094e+02, 2.979713745117188e+02, 2.966609191894531e+02, 2.968990478515625e+02, 2.969129638671875e+02, 2.965253295898438e+02, 2.967495727539062e+02, 2.962158203125e+02, 2.966826782226562e+02, 2.9535986328125e+02, 2.960602416992188e+02, 2.956841430664062e+02, 2.958915100097656e+02, 2.955003356933594e+02, 2.934600830078125e+02, 2.941224365234375e+02, 2.925818786621094e+02, 2.921419067382812e+02, 2.928599243164062e+02, 2.915148315429688e+02, 2.920691223144531e+02, 2.939436645507812e+02, 2.926375732421875e+02, 2.904195556640625e+02, 2.91980224609375e+02, 2.920718688964844e+02, 2.905301208496094e+02, 2.907398986816406e+02, 2.901202697753906e+02, 2.900093688964844e+02, 2.924759521484375e+02, 2.906303100585938e+02, 2.909695129394531e+02, 2.895492553710938e+02, 2.903458862304688e+02, 2.896872253417969e+02, 2.911193237304688e+02, 2.893901062011719e+02]
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos b/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
similarity index 81%
rename from IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos
rename to IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
index e0b48cf208..82e9fbc0b0 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Examples/SimpleHouse.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Examples/SimpleHouse.mos
@@ -1,5 +1,5 @@
 simulateModel("IBPSA.Examples.SimpleHouse", stopTime=3.1536e+07, method="Lsodar", tolerance=1e-06, resultFile="SimpleHouse");
-createPlot(id=1, position={0, 0, 792, 1247}, y={"zone.T"}, range={0.0, 32000000.0, 19.5, 24.5}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={0, 0, 792, 1247}, y={"zon.T"}, range={0.0, 32000000.0, 19.5, 24.5}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 792, 413}, y={"heaWat.u"}, range={0.0, 32000000.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 792, 413}, y={"vavDam.y"}, range={0.0, 380.0, 0.098, 0.124}, grid=true, subPlot=3, colors={{28,108,200}});
 createPlot(id=2, position={818, 10, 662, 377}, y={"fan.sta_a.T", "fan.sta_b.T"}, range={0.0, 380.0, 18.0, 22.5}, grid=true, colors={{28,108,200}, {238,46,47}});