diff --git a/Applications/Grafana/package/Classes/DockerGrafana.yaml b/Applications/Grafana/package/Classes/DockerGrafana.yaml
index 914ad62..eee3773 100644
--- a/Applications/Grafana/package/Classes/DockerGrafana.yaml
+++ b/Applications/Grafana/package/Classes/DockerGrafana.yaml
@@ -50,7 +50,7 @@ Methods:
   deploy:
     Body:
       - $.influxDB.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
 
   getContainer:
diff --git a/Applications/GuestBook/package/Classes/GuestBook.yaml b/Applications/GuestBook/package/Classes/GuestBook.yaml
index ccadc80..1a44a92 100644
--- a/Applications/GuestBook/package/Classes/GuestBook.yaml
+++ b/Applications/GuestBook/package/Classes/GuestBook.yaml
@@ -56,7 +56,7 @@ Methods:
           publish => false,
           redisMaster => $this.redisMaster)
       - $.redisSlave.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
 
   getContainer:
diff --git a/Applications/Orion/package/Classes/DockerOrion.yaml b/Applications/Orion/package/Classes/DockerOrion.yaml
index 6426abc..3648d7a 100644
--- a/Applications/Orion/package/Classes/DockerOrion.yaml
+++ b/Applications/Orion/package/Classes/DockerOrion.yaml
@@ -39,7 +39,7 @@ Methods:
   deploy:
     Body:
       - $.mongodb.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
   getContainer:
     Body:
diff --git a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
index 61895a6..7c2c0f6 100644
--- a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
+++ b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
@@ -273,7 +273,7 @@ Methods:
       - applicationName:
           Contract: $.string().notNull()
     Body:
-      - Return: format('{0}-{1}', $applicationName, $.id())
+      - Return: format('{0}-{1}', $applicationName, id($))
 
 
   _removeApplicationEndpoints:
@@ -305,4 +305,4 @@ Methods:
 
   getInternalScopeId:
     Body:
-      Return: $.id()
+      Return: id($)
diff --git a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
index f4aca0d..2f2ecf6 100644
--- a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
+++ b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
@@ -305,7 +305,7 @@ Methods:
 
   getInternalScopeId:
     Body:
-      Return: $.kubernetesCluster.id()
+      Return: id($.kubernetesCluster)
 
   scalePodDown:
     Usage: Action