diff --git a/docs/ACTION.md b/docs/ACTION.md
index 2d9854c..840feb2 100644
--- a/docs/ACTION.md
+++ b/docs/ACTION.md
@@ -22,7 +22,7 @@
 
 ## How to write Go Actions
 
-The `actionloop-golang-v1.11` runtime can execute actions written in the Go programming language in OpenWhisk, either precompiled binary or compiling sources on the fly.
+The `action-golang-v1.11` runtime can execute actions written in the Go programming language in OpenWhisk, either precompiled binary or compiling sources on the fly.
 
 ### Entry Point
 
@@ -122,7 +122,7 @@
 
 Note here we are just interested in the payload, but in general you may also want to retrieve other fields.
 
-Note the `actionloop` image will accept any source and will try to run it (if it is possible), while the `actionloop-golang-v1.11`  will instead try to compile the sources assuming it is Golang instead.
+Note the `actionloop` image will accept any source and will try to run it (if it is possible), while the `action-golang-v1.11`  will instead try to compile the sources assuming it is Golang instead.
 
 <a name="actionloopgo">
 
diff --git a/docs/BUILD.md b/docs/BUILD.md
index dd8b8e4..d268425 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -43,7 +43,7 @@
 
 This will build the images:
 
-* `actionloop-golang-v1.11`: an image supporting  Go sources
+* `action-golang-v1.11`: an image supporting  Go sources
 * `actionloop`: the base image, supporting generic executables ans shell script
 
 The `actionloop` image can be used for supporting other compiled programming languages as long as they implement a `compile` script and the *action loop* protocol described below.
diff --git a/docs/DEPLOY.md b/docs/DEPLOY.md
index fc0185e..55f6e11 100644
--- a/docs/DEPLOY.md
+++ b/docs/DEPLOY.md
@@ -19,7 +19,7 @@
 
 # Deployment options
 
-There are two images provided: the `actionloop` and the `actionloop-golang-v1.11` available. Each image accept different input in the deployment.
+There are two images provided: the `actionloop` and the `action-golang-v1.11` available. Each image accept different input in the deployment.
 
 <a name="actionloop">
 
@@ -40,7 +40,7 @@
 
 ## Golang runtime
 
-The runtime `actionloop-golang-v1.11` accepts:
+The runtime `action-golang-v1.11` accepts:
 
 - executable binaries implementing the ActionLoop protocol as Linux ELF executable compiled for the AMD64 architecture (as the `actionloop` runtme)
 - zip files containing a binary executable named `exec` in the top level, and it must be again a Linux ELF executable compiled for the AMD64 architecture
@@ -141,7 +141,7 @@
 
 ## Precompiling Go Sources Offline
 
-Compiling sources on the image can take some time when the images is initialized. You can speed up precompiling the sources using the image `actionloop-golang-v1.11` as an offline compiler. You need `docker` for doing that.
+Compiling sources on the image can take some time when the images is initialized. You can speed up precompiling the sources using the image `action-golang-v1.11` as an offline compiler. You need `docker` for doing that.
 
 The images accepts a `-compile <main>` flag, and expects you provide sources in standard input. It will then compile them, emit the binary in standard output and errors in stderr. The output is always a zip file containing an executable.
 
@@ -149,17 +149,17 @@
 
 If you have a single source maybe in file `main.go`, with a function named `Main` just do this:
 
-`docker run openwhisk/actionloop-golang-v1.11 -compile main <main.go >main.zip`
+`docker run openwhisk/action-golang-v1.11 -compile main <main.go >main.zip`
 
 If you have multiple sources in current directory, even with a subfolder with sources, you can compile it all with:
 
-`zip -r - * | docker run openwhisk/actionloop-golang-v1.11 -compile main >main.zip`
+`zip -r - * | docker run openwhisk/action-golang-v1.11 -compile main >main.zip`
 
 The  generated executable is suitable to be deployed in OpenWhisk using just the generic `actionloop` runtime.
 
 `wsk action create my/action main.zip -docker openwhisk/actionloop`
 
-You can also use the full `actionloop-golang-v1.11` as runtime, it is only bigger.
+You can also use the full `action-golang-v1.11` as runtime, it is only bigger.
 
 Note that the output is always a zip file in  Linux AMD64 format so the executable can be run only inside a Docker Linux container.
 
diff --git a/examples/benchmark/Makefile b/examples/benchmark/Makefile
index 61e6bd5..b3bf6f5 100644
--- a/examples/benchmark/Makefile
+++ b/examples/benchmark/Makefile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-IMG?=whisk/actionloop-golang-v1.11
+IMG?=whisk/action-golang-v1.11
 IMG2?=whisk/actionloop
 
 all: golang bash
diff --git a/examples/golang-hello-single/Makefile b/examples/golang-hello-single/Makefile
index 77a465d..9683f95 100644
--- a/examples/golang-hello-single/Makefile
+++ b/examples/golang-hello-single/Makefile
@@ -17,7 +17,7 @@
 
 OW_USER?=openwhisk
 OW_RUNTIME?=$(OW_USER)/actionloop-base
-OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
+OW_COMPILER?=$(OW_USER)/action-golang-v1.11
 WSK?=wsk
 MAIN=hello
 PACKAGE=test
diff --git a/examples/golang-hello-vendor/Makefile b/examples/golang-hello-vendor/Makefile
index 071cc18..459ae2a 100644
--- a/examples/golang-hello-vendor/Makefile
+++ b/examples/golang-hello-vendor/Makefile
@@ -17,7 +17,7 @@
 
 OW_USER?=openwhisk
 OW_RUNTIME?=$(OW_USER)/actionloop-base
-OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
+OW_COMPILER?=$(OW_USER)/action-golang-v1.11
 WSK?=wsk
 MAIN=hello
 PACKAGE=test
diff --git a/examples/golang-main-package/Makefile b/examples/golang-main-package/Makefile
index 8cafe1d..2c7cd55 100644
--- a/examples/golang-main-package/Makefile
+++ b/examples/golang-main-package/Makefile
@@ -17,7 +17,7 @@
 
 OW_USER?=openwhisk
 OW_RUNTIME?=$(OW_USER)/actionloop-base
-OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
+OW_COMPILER?=$(OW_USER)/action-golang-v1.11
 WSK?=wsk
 MAIN=main
 PACKAGE=test
diff --git a/examples/golang-main-single/Makefile b/examples/golang-main-single/Makefile
index 6207c41..ff5c4ce 100644
--- a/examples/golang-main-single/Makefile
+++ b/examples/golang-main-single/Makefile
@@ -17,7 +17,7 @@
 
 OW_USER?=openwhisk
 OW_RUNTIME?=$(OW_USER)/actionloop-base
-OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
+OW_COMPILER?=$(OW_USER)/action-golang-v1.11
 WSK?=wsk
 MAIN=main
 PACKAGE=test
diff --git a/examples/golang-main-standalone/Makefile b/examples/golang-main-standalone/Makefile
index cf33efd..e02c87d 100644
--- a/examples/golang-main-standalone/Makefile
+++ b/examples/golang-main-standalone/Makefile
@@ -17,7 +17,7 @@
 
 OW_USER?=openwhisk
 OW_RUNTIME?=$(OW_USER)/actionloop-base
-OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
+OW_COMPILER?=$(OW_USER)/action-golang-v1.11
 WSK?=wsk
 MAIN=main
 PACKAGE=test
diff --git a/examples/golang-main-vendor/Makefile b/examples/golang-main-vendor/Makefile
index 933858c..efebea6 100644
--- a/examples/golang-main-vendor/Makefile
+++ b/examples/golang-main-vendor/Makefile
@@ -17,7 +17,7 @@
 
 OW_USER?=openwhisk
 OW_RUNTIME?=$(OW_USER)/actionloop-base
-OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
+OW_COMPILER?=$(OW_USER)/action-golang-v1.11
 WSK?=wsk
 MAIN=main
 PACKAGE=test
diff --git a/golang1.11/build.gradle b/golang1.11/build.gradle
index 92bbb7a..c576a8b 100644
--- a/golang1.11/build.gradle
+++ b/golang1.11/build.gradle
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-ext.dockerImageName = 'actionloop-golang-v1.11'
+ext.dockerImageName = 'action-golang-v1.11'
 apply from: '../gradle/docker.gradle'
 
 distDocker.dependsOn 'staticBuildProxy'
diff --git a/golang1.12/build.gradle b/golang1.12/build.gradle
index 91b1636..4dc2e36 100644
--- a/golang1.12/build.gradle
+++ b/golang1.12/build.gradle
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-ext.dockerImageName = 'actionloop-golang-v1.12'
+ext.dockerImageName = 'action-golang-v1.12'
 apply from: '../gradle/docker.gradle'
 
 distDocker.dependsOn 'staticBuildProxy'
diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo12Tests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo12Tests.scala
index 15ca741..d0b62c2 100644
--- a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo12Tests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo12Tests.scala
@@ -27,7 +27,7 @@
     extends BasicActionRunnerTests
     with WskActorSystem {
 
-  val goCompiler = "actionloop-golang-v1.12"
+  val goCompiler = "action-golang-v1.12"
   val image = goCompiler
 
   override def withActionContainer(env: Map[String, String] = Map.empty)(
diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGoTests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGoTests.scala
index d485ada..948efa9 100644
--- a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGoTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGoTests.scala
@@ -27,7 +27,7 @@
     extends BasicActionRunnerTests
     with WskActorSystem {
 
-  val goCompiler = "actionloop-golang-v1.11"
+  val goCompiler = "action-golang-v1.11"
   val image = goCompiler
 
   override def withActionContainer(env: Map[String, String] = Map.empty)(
diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopGo12ContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopGo12ContainerTests.scala
index aeda4cc..b08ed6f 100644
--- a/tests/src/test/scala/runtime/actionContainers/ActionLoopGo12ContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopGo12ContainerTests.scala
@@ -35,7 +35,7 @@
 
   import GoResourceHelpers._
 
-  val goCompiler = "actionloop-golang-v1.12"
+  val goCompiler = "action-golang-v1.12"
   val image = goCompiler
 
   def withActionLoopContainer(code: ActionContainer => Unit) =
diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopGoContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopGoContainerTests.scala
index 84f6dd4..2c3422c 100644
--- a/tests/src/test/scala/runtime/actionContainers/ActionLoopGoContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopGoContainerTests.scala
@@ -35,7 +35,7 @@
 
   import GoResourceHelpers._
 
-  val goCompiler = "actionloop-golang-v1.11"
+  val goCompiler = "action-golang-v1.11"
   val image = goCompiler
 
   def withActionLoopContainer(code: ActionContainer => Unit) =