diff --git a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
index becd305602f..790b7884243 100644
--- a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
+++ b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
@@ -1 +1 @@
-c07bc835970e730c2e3e7c2e7487b371
+871da6b74c9f493dd4a4e12e0589afd1
diff --git a/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
index 4d0d7685113..3685be1d6af 100644
--- a/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
+++ b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
@@ -1 +1 @@
-77560e40fe65800506b841193ca43fd6
+cea8833433e2ef85285ade2ceaf980fd
diff --git a/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum b/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum
index af51dff6f28..cc5aff54f0d 100644
--- a/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum
+++ b/Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum
@@ -1 +1 @@
-c66f628a17e46629d8b75226f9559a19
+5376a9103524e8ce186e4015664766e8
diff --git a/Buildings/Templates/AirHandlersFans/VAVMultiZone.mo b/Buildings/Templates/AirHandlersFans/VAVMultiZone.mo
index b89bd9f66b0..7d513742301 100644
--- a/Buildings/Templates/AirHandlersFans/VAVMultiZone.mo
+++ b/Buildings/Templates/AirHandlersFans/VAVMultiZone.mo
@@ -465,7 +465,7 @@ equation
connect(fanSupBlo.port_b, coiHeaPre.port_a)
annotation (Line(points={{-30,-200},{10,-200}}, color={0,127,255}));
annotation (
- __ctrlFlow_template,
+ __ctrlFlow(routing="template"),
defaultComponentName="VAV",
Icon(coordinateSystem(preserveAspectRatio=false), graphics={
Rectangle(
diff --git a/Buildings/Templates/AirHandlersFans/package.mo b/Buildings/Templates/AirHandlersFans/package.mo
index 2b3a902b3c2..6a436fb9168 100644
--- a/Buildings/Templates/AirHandlersFans/package.mo
+++ b/Buildings/Templates/AirHandlersFans/package.mo
@@ -3,7 +3,6 @@ package AirHandlersFans "Air handlers and fans"
extends Modelica.Icons.Package;
annotation (
- __ctrlFlow_template,
Documentation(info="
This package contains templates for air handlers and fans.
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/package.mo b/Buildings/Templates/Plants/Controls/HeatPumps/package.mo
index af3c9fb29f4..3d71f9d9bb9 100644
--- a/Buildings/Templates/Plants/Controls/HeatPumps/package.mo
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/package.mo
@@ -1,5 +1,5 @@
within Buildings.Templates.Plants.Controls;
-package HeatPumps
+package HeatPumps "Controllers for heat pump plants"
annotation (Documentation(info="
This package contains control sequences for heat pump plants.
diff --git a/Buildings/Templates/Plants/HeatPumps/package.mo b/Buildings/Templates/Plants/HeatPumps/package.mo
index 6d48e499260..393dca89f6e 100644
--- a/Buildings/Templates/Plants/HeatPumps/package.mo
+++ b/Buildings/Templates/Plants/HeatPumps/package.mo
@@ -1,5 +1,5 @@
within Buildings.Templates.Plants;
-package HeatPumps "Heat pump plant"
+package HeatPumps "Heat pump plants"
extends Modelica.Icons.Package;
annotation (
Documentation(
diff --git a/Buildings/Templates/ZoneEquipment/VAVBoxCoolingOnly.mo b/Buildings/Templates/ZoneEquipment/VAVBoxCoolingOnly.mo
index 3fd8d1afbf5..19b6d10630a 100644
--- a/Buildings/Templates/ZoneEquipment/VAVBoxCoolingOnly.mo
+++ b/Buildings/Templates/ZoneEquipment/VAVBoxCoolingOnly.mo
@@ -8,7 +8,7 @@ model VAVBoxCoolingOnly "VAV terminal unit cooling only"
"Guideline 36 controller for VAV terminal unit cooling only");
annotation (
- __ctrlFlow_template,
+ __ctrlFlow(routing="template"),
defaultComponentName="VAVBox",
Documentation(info="
Description
diff --git a/Buildings/Templates/ZoneEquipment/VAVBoxReheat.mo b/Buildings/Templates/ZoneEquipment/VAVBoxReheat.mo
index 0f979f85117..71f9d2c1a67 100644
--- a/Buildings/Templates/ZoneEquipment/VAVBoxReheat.mo
+++ b/Buildings/Templates/ZoneEquipment/VAVBoxReheat.mo
@@ -7,7 +7,7 @@ model VAVBoxReheat "VAV terminal unit with reheat"
"Guideline 36 controller for VAV terminal unit with reheat");
annotation (
- __ctrlFlow_template,
+ __ctrlFlow(routing="template"),
defaultComponentName="VAVBox",
Documentation(info="
Description
diff --git a/Buildings/Templates/ZoneEquipment/package.mo b/Buildings/Templates/ZoneEquipment/package.mo
index ee753d448d0..7ee197ea537 100644
--- a/Buildings/Templates/ZoneEquipment/package.mo
+++ b/Buildings/Templates/ZoneEquipment/package.mo
@@ -3,7 +3,6 @@ package ZoneEquipment "Zone equipment"
extends Modelica.Icons.Package;
annotation (
- __ctrlFlow_template,
Documentation(info="
This package contains templates for zone equipment (HVAC terminal units).
diff --git a/Buildings/Templates/package.mo b/Buildings/Templates/package.mo
index c4f771eb327..5356dd236c3 100644
--- a/Buildings/Templates/package.mo
+++ b/Buildings/Templates/package.mo
@@ -2,7 +2,9 @@ within Buildings;
package Templates "Package with templates for various HVAC systems"
extends Modelica.Icons.Package;
- annotation (Documentation(info="
+ annotation (
+ __ctrlFlow(routing="root"),
+ Documentation(info="
This package contains templates for common HVAC systems.
A template is defined as a user-configurable model that can represent various