diff --git a/docs/deployment/troubleshooting.md b/docs/deployment/troubleshooting.md
index 1b4a548..e789b55 100644
--- a/docs/deployment/troubleshooting.md
+++ b/docs/deployment/troubleshooting.md
@@ -238,7 +238,7 @@ You can usually do one of the following:
 Example:
 
 ```bash
-faas-cli new --lang go test-this
+faas-cli new --lang golang-middleware test-this
 
 faas-cli build -f test-this.yml
 
diff --git a/docs/openfaas-pro/dashboard.md b/docs/openfaas-pro/dashboard.md
index 133f5b6..b514cc0 100644
--- a/docs/openfaas-pro/dashboard.md
+++ b/docs/openfaas-pro/dashboard.md
@@ -69,7 +69,7 @@ Example snippet from stack.yml:
 ```yaml
 functions:
   cows:
-    lang: go
+    lang: golang-middleware
     handler: ./cows
     image: alexellis2/cows:0.1
     labels:
diff --git a/docs/openfaas-pro/kafka-events.md b/docs/openfaas-pro/kafka-events.md
index d2e29b0..b6a0513 100644
--- a/docs/openfaas-pro/kafka-events.md
+++ b/docs/openfaas-pro/kafka-events.md
@@ -37,7 +37,7 @@ Create a new function:
 
 ```bash
 export OPENFAAS_PREFIX=ghcr.io/openfaas
-faas-cli new --lang go provision-customer
+faas-cli new --lang golang-middleware provision-customer
 ```
 
 Now add an annotation for the `payment.created` topic, so that the `provision-customer` function is invoked for any message received:
@@ -52,7 +52,7 @@ functions:
   provision-customer:
     annotations:
       topic: payment.created
-    lang: go
+    lang: golang-middleware
     handler: ./provision-customer
     image: ghcr.io/openfaas:provision-customer
 ```
diff --git a/docs/openfaas-pro/scale-to-zero.md b/docs/openfaas-pro/scale-to-zero.md
index 2940751..6cfe655 100644
--- a/docs/openfaas-pro/scale-to-zero.md
+++ b/docs/openfaas-pro/scale-to-zero.md
@@ -55,7 +55,7 @@ Create a new function using the `go` template:
 
 ```bash
 export OPENFAAS_PREFIX=ttl.sh/daily-job:1h
-faas-cli new --lang go daily-job
+faas-cli new --lang golang-middleware daily-job
 ```
 
 Now add the labels from above, we'll use a 15 minute timeout.
@@ -70,7 +70,7 @@ provider:
 
 functions:
   daily-job:
-    lang: go
+    lang: golang-middleware
     handler: ./daily-job
     image: ttl.sh/daily-job:1h
     labels:
diff --git a/docs/reference/private-registries.md b/docs/reference/private-registries.md
index 671ba12..684a8cf 100644
--- a/docs/reference/private-registries.md
+++ b/docs/reference/private-registries.md
@@ -115,7 +115,7 @@ The secret *must* be created in the `openfaas-fn` namespace or the equivalent if
 Create a sample function with a `--prefix` variable:
 
 ```sh
-faas-cli new --lang go private-fn --prefix=registry:port/repo
+faas-cli new --lang golang-middleware private-fn --prefix=registry:port/repo
 ```
 
 Update the `stack.yml` file and add a reference to the new secret:
diff --git a/docs/reference/yaml.md b/docs/reference/yaml.md
index b3d4d80..de68a81 100644
--- a/docs/reference/yaml.md
+++ b/docs/reference/yaml.md
@@ -21,8 +21,8 @@ The YAML file can hold one to many functions separated by separate entries.
 Example:
 
 ```bash
-$ faas-cli new --lang go fn1
-$ faas-cli new --lang go fn2 --append=fn1.yml
+$ faas-cli new --lang golang-middleware fn1
+$ faas-cli new --lang golang-middleware fn2 --append=fn1.yml
 ```
 
 Produces:
@@ -34,11 +34,11 @@ provider:
 
 functions:
   fn1:
-    lang: go
+    lang: golang-middleware
     handler: ./fn1
     image: fn1:latest
   fn2:
-    lang: go
+    lang: golang-middleware
     handler: ./fn2
     image: fn2:latest
 ```
@@ -144,7 +144,7 @@ An example of a build argument may be for enabling Go modules, or a HTTP_PROXY a
 functions:
   with_go_modules:
     handler: ./with_go_modules
-    lang: go
+    lang: golang-middleware
     build_args:
       HTTP_PROXY: http://squid.corp.ad.example.com
       GO111MODULE: on
@@ -235,7 +235,7 @@ provider:
   gateway: http://127.0.0.1:8080
 functions:
   low:
-    lang: go
+    lang: golang-middleware
     handler: ./low
     image: alexellis2/low:latest
     constraints:
@@ -390,7 +390,7 @@ provider:
   gateway: http://127.0.0.1:8080
 functions:
   hello:
-    lang: python3
+    lang: python3-http
     handler: ./hello
     image: openfaas/hello:0.1.0