diff --git a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
index d6ff6959..59498049 100644
--- a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
+++ b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
@@ -31,7 +31,7 @@ Properties:
     Contract: $.class(res:Instance).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/ApacheHTTPServer/package/manifest.yaml b/ApacheHTTPServer/package/manifest.yaml
index 50472023..819735ba 100644
--- a/ApacheHTTPServer/package/manifest.yaml
+++ b/ApacheHTTPServer/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.apache.ApacheHttpServer
 Name: Apache HTTP Server
diff --git a/Cassandra/package/Classes/CassandraCluster.yaml b/Cassandra/package/Classes/CassandraCluster.yaml
index 1673891a..5a75ddd1 100644
--- a/Cassandra/package/Classes/CassandraCluster.yaml
+++ b/Cassandra/package/Classes/CassandraCluster.yaml
@@ -32,7 +32,7 @@ Properties:
     Contract: [$.class(CassandraNode).notNull()]
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Cassandra/package/Classes/CassandraNode.yaml b/Cassandra/package/Classes/CassandraNode.yaml
index 1f08d0ea..67cf6d3a 100644
--- a/Cassandra/package/Classes/CassandraNode.yaml
+++ b/Cassandra/package/Classes/CassandraNode.yaml
@@ -26,7 +26,7 @@ Properties:
     Contract: $.class(res:Instance).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $.resources: new(sys:Resources)
diff --git a/Cassandra/package/Resources/scripts/deployCassandra.sh b/Cassandra/package/Resources/scripts/deployCassandra.sh
index 95ae475b..93a9a4de 100644
--- a/Cassandra/package/Resources/scripts/deployCassandra.sh
+++ b/Cassandra/package/Resources/scripts/deployCassandra.sh
@@ -1,4 +1,15 @@
 #!/bin/bash
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
 
 ## Add public keys and signatures
 gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D
diff --git a/Cassandra/package/Resources/scripts/restartCassandra.sh b/Cassandra/package/Resources/scripts/restartCassandra.sh
index b4e32d85..7d5ffaa0 100644
--- a/Cassandra/package/Resources/scripts/restartCassandra.sh
+++ b/Cassandra/package/Resources/scripts/restartCassandra.sh
@@ -1,4 +1,15 @@
 #!/bin/bash
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
 
 ## Restart service for any changes to take the effect
 # Sleep for some time added as a helper
diff --git a/Cassandra/package/Resources/scripts/updateCassandraYaml.sh b/Cassandra/package/Resources/scripts/updateCassandraYaml.sh
index 78a5a73c..9817f5b7 100644
--- a/Cassandra/package/Resources/scripts/updateCassandraYaml.sh
+++ b/Cassandra/package/Resources/scripts/updateCassandraYaml.sh
@@ -1,4 +1,15 @@
 #!/bin/bash
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
 
 CLUSTER_NAME="$1"
 SEED_NODES="$2"
diff --git a/Cassandra/package/manifest.yaml b/Cassandra/package/manifest.yaml
index 1f071ff1..2d80cf46 100644
--- a/Cassandra/package/manifest.yaml
+++ b/Cassandra/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.apache.Cassandra
 Name: Apache Cassandra
diff --git a/Chef/GitChef/package/Classes/GitChef.yaml b/Chef/GitChef/package/Classes/GitChef.yaml
index 01436687..c5f4c3f4 100644
--- a/Chef/GitChef/package/Classes/GitChef.yaml
+++ b/Chef/GitChef/package/Classes/GitChef.yaml
@@ -1,3 +1,15 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 Namespaces:
   =: io.murano.conflang.chef.GitChef
   std: io.murano
@@ -17,7 +29,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Chef/GitChef/package/Resources/DeployGitChef.template b/Chef/GitChef/package/Resources/DeployGitChef.template
index 25154613..fc098212 100644
--- a/Chef/GitChef/package/Resources/DeployGitChef.template
+++ b/Chef/GitChef/package/Resources/DeployGitChef.template
@@ -1,3 +1,15 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 FormatVersion: 2.1.0
 Version: 1.0.0
 Name: Deploy Git Chef
diff --git a/Chef/GitChef/package/manifest.yaml b/Chef/GitChef/package/manifest.yaml
index b360a7fc..cf7e5273 100644
--- a/Chef/GitChef/package/manifest.yaml
+++ b/Chef/GitChef/package/manifest.yaml
@@ -1,4 +1,16 @@
-Format: 1.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
+Format: 1.3
 Type: Application
 FullName: io.murano.conflang.chef.GitChef
 Name: GitChef
diff --git a/Chef/OrionChef/package/Classes/OrionChef.yaml b/Chef/OrionChef/package/Classes/OrionChef.yaml
index b334bbde..6e169b1c 100644
--- a/Chef/OrionChef/package/Classes/OrionChef.yaml
+++ b/Chef/OrionChef/package/Classes/OrionChef.yaml
@@ -1,3 +1,15 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 Namespaces:
   =: io.murano.conflang.fiware.OrionChef
   std: io.murano
@@ -18,7 +30,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Chef/OrionChef/package/Resources/DeployOrionChef.template b/Chef/OrionChef/package/Resources/DeployOrionChef.template
index 8c3d5d10..56e47a0d 100644
--- a/Chef/OrionChef/package/Resources/DeployOrionChef.template
+++ b/Chef/OrionChef/package/Resources/DeployOrionChef.template
@@ -1,3 +1,15 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 FormatVersion: 2.1.0
 Version: 1.0.0
 Name: Deploy Orion Chef
diff --git a/Chef/OrionChef/package/manifest.yaml b/Chef/OrionChef/package/manifest.yaml
index 6270a382..f7aad379 100644
--- a/Chef/OrionChef/package/manifest.yaml
+++ b/Chef/OrionChef/package/manifest.yaml
@@ -1,4 +1,16 @@
-Format: 1.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
+Format: 1.3
 Type: Application
 FullName: io.murano.conflang.fiware.OrionChef
 Name: OrionChef
diff --git a/CloudFoundry/package/Classes/CloudFoundry.yaml b/CloudFoundry/package/Classes/CloudFoundry.yaml
index 16293987..5a8beb70 100644
--- a/CloudFoundry/package/Classes/CloudFoundry.yaml
+++ b/CloudFoundry/package/Classes/CloudFoundry.yaml
@@ -26,7 +26,7 @@ Properties:
     Contract: $.class(res:Instance).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/CloudFoundry/package/manifest.yaml b/CloudFoundry/package/manifest.yaml
index 38548a4e..4f2f7bb2 100644
--- a/CloudFoundry/package/manifest.yaml
+++ b/CloudFoundry/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.paas.CloudFoundry
 Name: Cloud Foundry
diff --git a/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml b/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml
index 9da61a8b..2cac0626 100644
--- a/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml
+++ b/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml
@@ -25,7 +25,7 @@ Properties:
     Contract: $.class(res:Instance).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $.environment: $.find(std:Environment).require()
 
diff --git a/CloudFoundryDiego/package/manifest.yaml b/CloudFoundryDiego/package/manifest.yaml
index c923ec1a..c2e81243 100644
--- a/CloudFoundryDiego/package/manifest.yaml
+++ b/CloudFoundryDiego/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.paas.CloudFoundryDiego
 Name: Cloud Foundry Diego
diff --git a/Docker/Applications/Crate/package/Classes/DockerCrate.yaml b/Docker/Applications/Crate/package/Classes/DockerCrate.yaml
index 1f20f988..47a72f0f 100644
--- a/Docker/Applications/Crate/package/Classes/DockerCrate.yaml
+++ b/Docker/Applications/Crate/package/Classes/DockerCrate.yaml
@@ -28,7 +28,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Crate/package/manifest.yaml b/Docker/Applications/Crate/package/manifest.yaml
index 9e0af72e..66a23067 100644
--- a/Docker/Applications/Crate/package/manifest.yaml
+++ b/Docker/Applications/Crate/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerCrate
 Name: Docker Crate
diff --git a/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml b/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml
index 7d5a5c1d..caad0b88 100644
--- a/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml
+++ b/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml
@@ -36,7 +36,7 @@ Properties:
     Contract: $.string().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/DockerApp/package/manifest.yaml b/Docker/Applications/DockerApp/package/manifest.yaml
index 47d3408c..0fa19ee9 100644
--- a/Docker/Applications/DockerApp/package/manifest.yaml
+++ b/Docker/Applications/DockerApp/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerApp
 Name: Docker Container
diff --git a/Docker/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml b/Docker/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml
index 76324f15..a8086bde 100644
--- a/Docker/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml
+++ b/Docker/Applications/Elasticsearch/package/Classes/DockerElasticsearch.yaml
@@ -34,7 +34,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Elasticsearch/package/manifest.yaml b/Docker/Applications/Elasticsearch/package/manifest.yaml
index dd6629b9..d78e5a87 100644
--- a/Docker/Applications/Elasticsearch/package/manifest.yaml
+++ b/Docker/Applications/Elasticsearch/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerElasticsearch
 Name: Docker Elasticsearch
diff --git a/Docker/Applications/GlassFish/package/Classes/DockerGlassFish.yaml b/Docker/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
index b1288057..b6fd81a9 100644
--- a/Docker/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
+++ b/Docker/Applications/GlassFish/package/Classes/DockerGlassFish.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/GlassFish/package/manifest.yaml b/Docker/Applications/GlassFish/package/manifest.yaml
index 754bc997..b5f97094 100644
--- a/Docker/Applications/GlassFish/package/manifest.yaml
+++ b/Docker/Applications/GlassFish/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerGlassFish
 Name: Docker GlassFish
diff --git a/Docker/Applications/Grafana/package/Classes/DockerGrafana.yaml b/Docker/Applications/Grafana/package/Classes/DockerGrafana.yaml
index 69614214..3890a809 100644
--- a/Docker/Applications/Grafana/package/Classes/DockerGrafana.yaml
+++ b/Docker/Applications/Grafana/package/Classes/DockerGrafana.yaml
@@ -40,7 +40,7 @@ Properties:
     Contract: $.string().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Grafana/package/manifest.yaml b/Docker/Applications/Grafana/package/manifest.yaml
index 3e144cc7..bea854d6 100644
--- a/Docker/Applications/Grafana/package/manifest.yaml
+++ b/Docker/Applications/Grafana/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerGrafana
 Name: Docker Grafana
diff --git a/Docker/Applications/GuestBook/package/Classes/GuestBook.yaml b/Docker/Applications/GuestBook/package/Classes/GuestBook.yaml
index bf3e71d7..d0f5fa68 100644
--- a/Docker/Applications/GuestBook/package/Classes/GuestBook.yaml
+++ b/Docker/Applications/GuestBook/package/Classes/GuestBook.yaml
@@ -38,7 +38,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/GuestBook/package/manifest.yaml b/Docker/Applications/GuestBook/package/manifest.yaml
index 91fbb535..317e5b9c 100644
--- a/Docker/Applications/GuestBook/package/manifest.yaml
+++ b/Docker/Applications/GuestBook/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.GuestBook
 Name: Docker GuestBook
diff --git a/Docker/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml b/Docker/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
index eda2d27b..50e64f39 100644
--- a/Docker/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
+++ b/Docker/Applications/HTTPdServer/package/Classes/DockerHTTPd.yaml
@@ -28,7 +28,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/HTTPdServer/package/manifest.yaml b/Docker/Applications/HTTPdServer/package/manifest.yaml
index 100f90c5..5eac62f5 100644
--- a/Docker/Applications/HTTPdServer/package/manifest.yaml
+++ b/Docker/Applications/HTTPdServer/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerHTTPd
 Name: Docker HTTPd
diff --git a/Docker/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml b/Docker/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
index bb060dd2..6b540c12 100644
--- a/Docker/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
+++ b/Docker/Applications/HTTPdSite/package/Classes/DockerHTTPdSite.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/HTTPdSite/package/manifest.yaml b/Docker/Applications/HTTPdSite/package/manifest.yaml
index 4e7b6f83..1e2efa60 100644
--- a/Docker/Applications/HTTPdSite/package/manifest.yaml
+++ b/Docker/Applications/HTTPdSite/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerHTTPdSite
 Name: Docker HTTPd Site
diff --git a/Docker/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml b/Docker/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
index f1632d96..b25e888d 100644
--- a/Docker/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
+++ b/Docker/Applications/InfluxDB/package/Classes/DockerInfluxDB.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/InfluxDB/package/manifest.yaml b/Docker/Applications/InfluxDB/package/manifest.yaml
index bd4ce142..7a7609af 100644
--- a/Docker/Applications/InfluxDB/package/manifest.yaml
+++ b/Docker/Applications/InfluxDB/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerInfluxDB
 Name: Docker InfluxDB
diff --git a/Docker/Applications/JBoss/package/Classes/DockerJBoss.yaml b/Docker/Applications/JBoss/package/Classes/DockerJBoss.yaml
index bf3b5631..9b87fd5d 100644
--- a/Docker/Applications/JBoss/package/Classes/DockerJBoss.yaml
+++ b/Docker/Applications/JBoss/package/Classes/DockerJBoss.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/JBoss/package/manifest.yaml b/Docker/Applications/JBoss/package/manifest.yaml
index eb8ff87a..546cd938 100644
--- a/Docker/Applications/JBoss/package/manifest.yaml
+++ b/Docker/Applications/JBoss/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerJBoss
 Name: Docker JBoss
diff --git a/Docker/Applications/Jenkins/package/Classes/DockerJenkins.yaml b/Docker/Applications/Jenkins/package/Classes/DockerJenkins.yaml
index cc134528..234e5e6d 100644
--- a/Docker/Applications/Jenkins/package/Classes/DockerJenkins.yaml
+++ b/Docker/Applications/Jenkins/package/Classes/DockerJenkins.yaml
@@ -28,7 +28,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Jenkins/package/manifest.yaml b/Docker/Applications/Jenkins/package/manifest.yaml
index f3492a4d..33a7c80f 100644
--- a/Docker/Applications/Jenkins/package/manifest.yaml
+++ b/Docker/Applications/Jenkins/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerJenkins
 Name: Docker Jenkins
diff --git a/Docker/Applications/MariaDB/package/Classes/DockerMariaDB.yaml b/Docker/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
index 810167fb..e7ec3e9b 100644
--- a/Docker/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
+++ b/Docker/Applications/MariaDB/package/Classes/DockerMariaDB.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/MariaDB/package/manifest.yaml b/Docker/Applications/MariaDB/package/manifest.yaml
index 71efc72f..943ef8bf 100644
--- a/Docker/Applications/MariaDB/package/manifest.yaml
+++ b/Docker/Applications/MariaDB/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerMariaDB
 Name: Docker MariaDB
diff --git a/Docker/Applications/MongoDB/package/Classes/DockerMongoDB.yaml b/Docker/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
index 9b19bde4..d061eb92 100644
--- a/Docker/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
+++ b/Docker/Applications/MongoDB/package/Classes/DockerMongoDB.yaml
@@ -28,7 +28,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/MongoDB/package/manifest.yaml b/Docker/Applications/MongoDB/package/manifest.yaml
index 616e348a..7dd4e2db 100644
--- a/Docker/Applications/MongoDB/package/manifest.yaml
+++ b/Docker/Applications/MongoDB/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerMongoDB
 Name: Docker MongoDB
diff --git a/Docker/Applications/MySQL/package/Classes/DockerMySQL.yaml b/Docker/Applications/MySQL/package/Classes/DockerMySQL.yaml
index 93d39f42..8c91d31f 100644
--- a/Docker/Applications/MySQL/package/Classes/DockerMySQL.yaml
+++ b/Docker/Applications/MySQL/package/Classes/DockerMySQL.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/MySQL/package/manifest.yaml b/Docker/Applications/MySQL/package/manifest.yaml
index 0690d801..910a41d7 100644
--- a/Docker/Applications/MySQL/package/manifest.yaml
+++ b/Docker/Applications/MySQL/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerMySQL
 Name: Docker MySQL
diff --git a/Docker/Applications/Nginx/package/Classes/DockerNginx.yaml b/Docker/Applications/Nginx/package/Classes/DockerNginx.yaml
index cd9f1ea8..f7119e0c 100644
--- a/Docker/Applications/Nginx/package/Classes/DockerNginx.yaml
+++ b/Docker/Applications/Nginx/package/Classes/DockerNginx.yaml
@@ -28,7 +28,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Nginx/package/manifest.yaml b/Docker/Applications/Nginx/package/manifest.yaml
index 3fa7134f..ad3e6e37 100644
--- a/Docker/Applications/Nginx/package/manifest.yaml
+++ b/Docker/Applications/Nginx/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerNginx
 Name: Docker Nginx
diff --git a/Docker/Applications/NginxSite/package/Classes/DockerNginxSite.yaml b/Docker/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
index e949f19d..bfe34bc8 100644
--- a/Docker/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
+++ b/Docker/Applications/NginxSite/package/Classes/DockerNginxSite.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/NginxSite/package/manifest.yaml b/Docker/Applications/NginxSite/package/manifest.yaml
index f64d5105..d41c653a 100644
--- a/Docker/Applications/NginxSite/package/manifest.yaml
+++ b/Docker/Applications/NginxSite/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerNginxSite
 Name: Docker Nginx Site
diff --git a/Docker/Applications/Orion/package/Classes/DockerOrion.yaml b/Docker/Applications/Orion/package/Classes/DockerOrion.yaml
index 0306e185..859977cc 100644
--- a/Docker/Applications/Orion/package/Classes/DockerOrion.yaml
+++ b/Docker/Applications/Orion/package/Classes/DockerOrion.yaml
@@ -30,7 +30,7 @@ Properties:
     Contract: $.class(DockerMongoDB).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Orion/package/manifest.yaml b/Docker/Applications/Orion/package/manifest.yaml
index e82229da..22cf38c2 100644
--- a/Docker/Applications/Orion/package/manifest.yaml
+++ b/Docker/Applications/Orion/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerOrion
 Name: Orion Docker
diff --git a/Docker/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml b/Docker/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
index d30264ac..5885fcce 100644
--- a/Docker/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
+++ b/Docker/Applications/PostgreSQL/package/Classes/DockerPostgreSQL.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/PostgreSQL/package/manifest.yaml b/Docker/Applications/PostgreSQL/package/manifest.yaml
index 9e4fee19..1fd63b54 100644
--- a/Docker/Applications/PostgreSQL/package/manifest.yaml
+++ b/Docker/Applications/PostgreSQL/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerPostgreSQL
 Name: Docker Postgres
diff --git a/Docker/Applications/Redis/package/Classes/DockerRedis.yaml b/Docker/Applications/Redis/package/Classes/DockerRedis.yaml
index 10a801cf..42d12e7f 100644
--- a/Docker/Applications/Redis/package/Classes/DockerRedis.yaml
+++ b/Docker/Applications/Redis/package/Classes/DockerRedis.yaml
@@ -28,7 +28,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Redis/package/manifest.yaml b/Docker/Applications/Redis/package/manifest.yaml
index 4bbb24f4..ccf8b895 100644
--- a/Docker/Applications/Redis/package/manifest.yaml
+++ b/Docker/Applications/Redis/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerRedis
 Name: Docker Redis
diff --git a/Docker/Applications/Tomcat/package/Classes/DockerTomcat.yaml b/Docker/Applications/Tomcat/package/Classes/DockerTomcat.yaml
index 3eefdcea..a69a4d85 100644
--- a/Docker/Applications/Tomcat/package/Classes/DockerTomcat.yaml
+++ b/Docker/Applications/Tomcat/package/Classes/DockerTomcat.yaml
@@ -31,7 +31,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._scope: switch($.publish, $ => public, not $ => internal)
diff --git a/Docker/Applications/Tomcat/package/manifest.yaml b/Docker/Applications/Tomcat/package/manifest.yaml
index 586b629b..224cfd8d 100644
--- a/Docker/Applications/Tomcat/package/manifest.yaml
+++ b/Docker/Applications/Tomcat/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerTomcat
 Name: Docker Tomcat
diff --git a/Docker/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml
index 7516e240..b5503e4e 100644
--- a/Docker/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml
+++ b/Docker/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml
@@ -33,7 +33,7 @@ Properties:
     Usage: Out
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
@@ -59,7 +59,7 @@ Methods:
           - $.onInstallationFinish()
 
 
-  destroy:
+  .destroy:
     Body:
       - If: $.getAttr(container, null) != null
         Then:
diff --git a/Docker/DockerInterfacesLibrary/package/manifest.yaml b/Docker/DockerInterfacesLibrary/package/manifest.yaml
index c0280925..d0a3f2ac 100644
--- a/Docker/DockerInterfacesLibrary/package/manifest.yaml
+++ b/Docker/DockerInterfacesLibrary/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Library
 FullName: io.murano.apps.docker.Interfaces
 Name: Docker Interface Library
diff --git a/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml b/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
index 2f65a70b..1ab23777 100644
--- a/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
+++ b/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
@@ -57,7 +57,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()  
   
diff --git a/Docker/DockerStandaloneHost/package/manifest.yaml b/Docker/DockerStandaloneHost/package/manifest.yaml
index 6a60a375..560f242a 100644
--- a/Docker/DockerStandaloneHost/package/manifest.yaml
+++ b/Docker/DockerStandaloneHost/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.DockerStandaloneHost
 Name: Docker Standalone Host
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
index 3fbca370..e2a02133 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
+++ b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml
@@ -71,7 +71,7 @@ Properties:
     Usage: Out
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
index 7046f9ab..53cbeb67 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
+++ b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml
@@ -21,7 +21,7 @@ Name: KubernetesGatewayNode
 Extends: KubernetesNode
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._cluster: $.find(KubernetesCluster).require()
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
index 4692af34..cf532b79 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
+++ b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml
@@ -21,7 +21,7 @@ Name: KubernetesMasterNode
 Extends: KubernetesNode
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
index 2dac1bd7..8515d92a 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
+++ b/Docker/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
@@ -27,7 +27,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._cluster: $.find(KubernetesCluster).require()
diff --git a/Docker/Kubernetes/KubernetesCluster/package/manifest.yaml b/Docker/Kubernetes/KubernetesCluster/package/manifest.yaml
index 333e178a..92032a32 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/manifest.yaml
+++ b/Docker/Kubernetes/KubernetesCluster/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.kubernetes.KubernetesCluster
 Name: Kubernetes Cluster
diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
index 3627f0c8..6062b1d8 100644
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
@@ -26,7 +26,7 @@ Properties:
     Contract: {}
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
index 17298a29..72bf3285 100644
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
@@ -25,7 +25,7 @@ Properties:
     Contract: {}
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
index 00933af1..32e1e3de 100644
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
@@ -25,7 +25,7 @@ Properties:
     Contract: {}
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml
index cb121f2a..07a4028b 100644
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Library
 FullName: io.murano.apps.docker.kubernetes.static.KubernetesEntities
 Name: Kubernetes static entities
diff --git a/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml b/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
index 79592266..e532d68b 100644
--- a/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
+++ b/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
@@ -39,7 +39,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._podDefinition: null
diff --git a/Docker/Kubernetes/KubernetesPod/package/manifest.yaml b/Docker/Kubernetes/KubernetesPod/package/manifest.yaml
index 2dc7a643..ab31db30 100644
--- a/Docker/Kubernetes/KubernetesPod/package/manifest.yaml
+++ b/Docker/Kubernetes/KubernetesPod/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.docker.kubernetes.KubernetesPod
 Name: Kubernetes Pod
diff --git a/Guacamole/package/Classes/Guacamole.yaml b/Guacamole/package/Classes/Guacamole.yaml
index 006d7128..cd252376 100644
--- a/Guacamole/package/Classes/Guacamole.yaml
+++ b/Guacamole/package/Classes/Guacamole.yaml
@@ -29,7 +29,7 @@ Properties:
     Contract: $.class(srv:Tomcat).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Guacamole/package/manifest.yaml b/Guacamole/package/manifest.yaml
index 93387534..11349200 100644
--- a/Guacamole/package/manifest.yaml
+++ b/Guacamole/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.Guacamole
 Name: Guacamole
diff --git a/HDPSandbox/package/Classes/HDPSandbox.yaml b/HDPSandbox/package/Classes/HDPSandbox.yaml
index 0e126084..6b03d77c 100644
--- a/HDPSandbox/package/Classes/HDPSandbox.yaml
+++ b/HDPSandbox/package/Classes/HDPSandbox.yaml
@@ -1,3 +1,15 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 Namespaces:
   =: io.murano.apps.linux
   std: io.murano
@@ -13,20 +25,20 @@ Properties:
     Contract: $.class(res:Instance).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
-      - $.environment: $.find(std:Environment).require()
+      - $._environment: $.find(std:Environment).require()
 
   deploy:
     Body:
-      - $.environment.reporter.report($this, 'Creating VM')
+      - $._environment.reporter.report($this, 'Creating VM')
       - $securityGroupIngress:
         - FromPort: 1
           ToPort: 65535
           IpProtocol: tcp
           External: true
-      - $.environment.securityGroupManager.addGroupIngress($securityGroupIngress)
+      - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
       - $.instance.deploy()
       - $msg: 'HDP Sandbox is installed and running at http://'
       - $ep: $.instance.floatingIpAddress + ':8888'
-      - $.environment.reporter.report($this, $msg + $ep)
+      - $._environment.reporter.report($this, $msg + $ep)
diff --git a/HDPSandbox/package/UI/ui.yaml b/HDPSandbox/package/UI/ui.yaml
index a375dfc5..b3fc6538 100644
--- a/HDPSandbox/package/UI/ui.yaml
+++ b/HDPSandbox/package/UI/ui.yaml
@@ -1,3 +1,15 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 Version: 2.2
 
 Templates:
diff --git a/HDPSandbox/package/manifest.yaml b/HDPSandbox/package/manifest.yaml
index 1ebc54ec..3aae2130 100644
--- a/HDPSandbox/package/manifest.yaml
+++ b/HDPSandbox/package/manifest.yaml
@@ -1,4 +1,16 @@
-Format: 1.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.HDPSandbox
 Name: 'Hortonworks Data Platform 2.2 Sandbox'
diff --git a/MongoDB/package/Classes/MongoDB.yaml b/MongoDB/package/Classes/MongoDB.yaml
index 26c90438..c86fcfd3 100644
--- a/MongoDB/package/Classes/MongoDB.yaml
+++ b/MongoDB/package/Classes/MongoDB.yaml
@@ -32,7 +32,7 @@ Properties:
     Contract: $.string()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/MongoDB/package/manifest.yaml b/MongoDB/package/manifest.yaml
index 55a4bb70..0d4cb573 100644
--- a/MongoDB/package/manifest.yaml
+++ b/MongoDB/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.databases.MongoDB
 Name: MongoDB
diff --git a/MySQL/package/Classes/MySql.yaml b/MySQL/package/Classes/MySql.yaml
index f13acf7d..553ee847 100644
--- a/MySQL/package/Classes/MySql.yaml
+++ b/MySQL/package/Classes/MySql.yaml
@@ -32,7 +32,7 @@ Properties:
     Contract: $.string()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/MySQL/package/manifest.yaml b/MySQL/package/manifest.yaml
index b84baee7..03541d67 100644
--- a/MySQL/package/manifest.yaml
+++ b/MySQL/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.databases.MySql
 Name: MySQL
diff --git a/PivotalOperationsManager/package/Classes/OpsManager.yaml b/PivotalOperationsManager/package/Classes/OpsManager.yaml
index fc6dd920..93a06f5a 100644
--- a/PivotalOperationsManager/package/Classes/OpsManager.yaml
+++ b/PivotalOperationsManager/package/Classes/OpsManager.yaml
@@ -44,7 +44,7 @@ Properties:
     Contract: $.string().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
       - $._securityGroupName: ''
diff --git a/PivotalOperationsManager/package/Classes/OpsManagerInstance.yaml b/PivotalOperationsManager/package/Classes/OpsManagerInstance.yaml
index 165dd6e9..c588da2a 100644
--- a/PivotalOperationsManager/package/Classes/OpsManagerInstance.yaml
+++ b/PivotalOperationsManager/package/Classes/OpsManagerInstance.yaml
@@ -19,7 +19,7 @@ Name: OpsManagerInstance
 Extends: LinuxInstance
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $.customUserData: null
 
diff --git a/PivotalOperationsManager/package/manifest.yaml b/PivotalOperationsManager/package/manifest.yaml
index 121c3a00..bfa3f582 100644
--- a/PivotalOperationsManager/package/manifest.yaml
+++ b/PivotalOperationsManager/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.pivotal.OpsManager
 Name: Pivotal Operations Manager
diff --git a/PostgreSQL/package/Classes/PostgreSql.yaml b/PostgreSQL/package/Classes/PostgreSql.yaml
index 545f5108..f2d8220f 100644
--- a/PostgreSQL/package/Classes/PostgreSql.yaml
+++ b/PostgreSQL/package/Classes/PostgreSql.yaml
@@ -33,7 +33,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/PostgreSQL/package/manifest.yaml b/PostgreSQL/package/manifest.yaml
index 6798a1f8..3fecb0db 100644
--- a/PostgreSQL/package/manifest.yaml
+++ b/PostgreSQL/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.databases.PostgreSql
 Name: PostgreSQL
diff --git a/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml b/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml
index 3f843f05..573bf202 100644
--- a/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml
+++ b/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml
@@ -20,7 +20,7 @@ Properties:
 
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Puppet/MySQLPuppet/package/manifest.yaml b/Puppet/MySQLPuppet/package/manifest.yaml
index 534968df..555ec94d 100644
--- a/Puppet/MySQLPuppet/package/manifest.yaml
+++ b/Puppet/MySQLPuppet/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.conflang.puppet.MySQLPuppet
 Name: MySQLPuppet
diff --git a/Rally/package/Classes/Rally.yaml b/Rally/package/Classes/Rally.yaml
index 9d579436..f3c38302 100644
--- a/Rally/package/Classes/Rally.yaml
+++ b/Rally/package/Classes/Rally.yaml
@@ -34,7 +34,7 @@ Properties:
     Default: master
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Rally/package/manifest.yaml b/Rally/package/manifest.yaml
index 581d4527..47058730 100644
--- a/Rally/package/manifest.yaml
+++ b/Rally/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: org.openstack.Rally
 Name: Rally
diff --git a/SQLDatabaseLibrary/package/manifest.yaml b/SQLDatabaseLibrary/package/manifest.yaml
index 9d8327d7..4d63fa39 100644
--- a/SQLDatabaseLibrary/package/manifest.yaml
+++ b/SQLDatabaseLibrary/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Library
 FullName: io.murano.databases
 Name: SQL Library
diff --git a/SugarCRM/package/Classes/SugarCRM.yaml b/SugarCRM/package/Classes/SugarCRM.yaml
index a7c8171e..b1ac339f 100644
--- a/SugarCRM/package/Classes/SugarCRM.yaml
+++ b/SugarCRM/package/Classes/SugarCRM.yaml
@@ -63,7 +63,7 @@ Properties:
     Contract: $.bool().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/SugarCRM/package/manifest.yaml b/SugarCRM/package/manifest.yaml
index ec57b9fe..fb98765e 100644
--- a/SugarCRM/package/manifest.yaml
+++ b/SugarCRM/package/manifest.yaml
@@ -31,7 +31,7 @@
 # technical reasons, the Appropriate Legal Notices must display the words
 # "Powered by SugarCRM".
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.SugarCRM
 Name: Sugar CRM
diff --git a/Tomcat/package/Classes/Tomcat.yaml b/Tomcat/package/Classes/Tomcat.yaml
index b5c6704b..cbc8f0f3 100644
--- a/Tomcat/package/Classes/Tomcat.yaml
+++ b/Tomcat/package/Classes/Tomcat.yaml
@@ -26,7 +26,7 @@ Properties:
     Contract: $.class(res:Instance).notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Tomcat/package/Classes/TomcatTest.yaml b/Tomcat/package/Classes/TomcatTest.yaml
index 4cfbab4b..18e5fc75 100644
--- a/Tomcat/package/Classes/TomcatTest.yaml
+++ b/Tomcat/package/Classes/TomcatTest.yaml
@@ -8,7 +8,7 @@ Extends: TestFixture
 Name: TomcatTest
 
 Methods:
-    initialize:
+    .init:
         Body:
             # Object model can be loaded from json file, or provided
             # directly in MuranoPL code as a yaml insertion.
diff --git a/Tomcat/package/manifest.yaml b/Tomcat/package/manifest.yaml
index f8aabb49..c481d2f6 100644
--- a/Tomcat/package/manifest.yaml
+++ b/Tomcat/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.apache.Tomcat
 Name: Apache Tomcat
diff --git a/Windows/ActiveDirectory/package/Classes/ActiveDirectory.yaml b/Windows/ActiveDirectory/package/Classes/ActiveDirectory.yaml
index 7351756c..ad352b31 100644
--- a/Windows/ActiveDirectory/package/Classes/ActiveDirectory.yaml
+++ b/Windows/ActiveDirectory/package/Classes/ActiveDirectory.yaml
@@ -37,7 +37,7 @@ Properties:
     Contract: $.string().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Windows/ActiveDirectory/package/Classes/DomainHost.yaml b/Windows/ActiveDirectory/package/Classes/DomainHost.yaml
index fb7f32b5..9ae826fd 100644
--- a/Windows/ActiveDirectory/package/Classes/DomainHost.yaml
+++ b/Windows/ActiveDirectory/package/Classes/DomainHost.yaml
@@ -23,7 +23,7 @@ Properties:
     Contract: $.class(ActiveDirectory)
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Windows/ActiveDirectory/package/Classes/Host.yaml b/Windows/ActiveDirectory/package/Classes/Host.yaml
index 224968ca..00747828 100644
--- a/Windows/ActiveDirectory/package/Classes/Host.yaml
+++ b/Windows/ActiveDirectory/package/Classes/Host.yaml
@@ -29,7 +29,7 @@ Properties:
     Contract: $.string().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/Windows/ActiveDirectory/package/Classes/PrimaryController.yaml b/Windows/ActiveDirectory/package/Classes/PrimaryController.yaml
index a3896f3f..a49847f9 100644
--- a/Windows/ActiveDirectory/package/Classes/PrimaryController.yaml
+++ b/Windows/ActiveDirectory/package/Classes/PrimaryController.yaml
@@ -26,7 +26,7 @@ Properties:
     Usage: Out
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._domain: $.find(ActiveDirectory).require()
       - $._environment: $.find(std:Environment).require()
diff --git a/Windows/ActiveDirectory/package/Classes/SecondaryController.yaml b/Windows/ActiveDirectory/package/Classes/SecondaryController.yaml
index 5b7b6dd7..37af3585 100644
--- a/Windows/ActiveDirectory/package/Classes/SecondaryController.yaml
+++ b/Windows/ActiveDirectory/package/Classes/SecondaryController.yaml
@@ -20,7 +20,7 @@ Name: SecondaryController
 Extends: Controller
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._domain: $.find(ActiveDirectory).require()
       - $._environment: $.find(std:Environment).require()
diff --git a/Windows/ActiveDirectory/package/manifest.yaml b/Windows/ActiveDirectory/package/manifest.yaml
index 4a36f948..7c3d9624 100644
--- a/Windows/ActiveDirectory/package/manifest.yaml
+++ b/Windows/ActiveDirectory/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 
 Type: Application
 
diff --git a/WordPress/package/Classes/WordPress.yaml b/WordPress/package/Classes/WordPress.yaml
index 75612f82..f0a4c2a2 100644
--- a/WordPress/package/Classes/WordPress.yaml
+++ b/WordPress/package/Classes/WordPress.yaml
@@ -36,7 +36,7 @@ Properties:
     Contract: $.class(ZabbixAgent)
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/WordPress/package/manifest.yaml b/WordPress/package/manifest.yaml
index c89a26cb..69d753e2 100644
--- a/WordPress/package/manifest.yaml
+++ b/WordPress/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.WordPress
 Name: WordPress
diff --git a/ZabbixAgent/package/Classes/ZabbixAgent.yaml b/ZabbixAgent/package/Classes/ZabbixAgent.yaml
index 0d62a99a..abfb6d17 100644
--- a/ZabbixAgent/package/Classes/ZabbixAgent.yaml
+++ b/ZabbixAgent/package/Classes/ZabbixAgent.yaml
@@ -31,7 +31,7 @@ Properties:
 
 Methods:
 
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/ZabbixAgent/package/manifest.yaml b/ZabbixAgent/package/manifest.yaml
index e0e44b6e..0c1ff080 100644
--- a/ZabbixAgent/package/manifest.yaml
+++ b/ZabbixAgent/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.ZabbixAgent
 Name: Zabbix Agent
diff --git a/ZabbixServer/package/Classes/ZabbixServer.yaml b/ZabbixServer/package/Classes/ZabbixServer.yaml
index 28a04218..7146222c 100644
--- a/ZabbixServer/package/Classes/ZabbixServer.yaml
+++ b/ZabbixServer/package/Classes/ZabbixServer.yaml
@@ -32,7 +32,7 @@ Properties:
     Contract: $.string().notNull()
 
 Methods:
-  initialize:
+  .init:
     Body:
       - $._environment: $.find(std:Environment).require()
 
diff --git a/ZabbixServer/package/manifest.yaml b/ZabbixServer/package/manifest.yaml
index fe256a78..c9271953 100644
--- a/ZabbixServer/package/manifest.yaml
+++ b/ZabbixServer/package/manifest.yaml
@@ -10,7 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-Format: 1.0
+Format: 1.3
 Type: Application
 FullName: io.murano.apps.ZabbixServer
 Name: Zabbix Server