diff --git a/.gon.hcl b/.gon.hcl
index 27d44cae..061b1bba 100644
--- a/.gon.hcl
+++ b/.gon.hcl
@@ -1,5 +1,5 @@
-source = ["./mariquita"]
-bundle_id = "dev.zmoog.mariquita"
+source = ["./iot-cloud-cli"]
+bundle_id = "dev.zmoog.iot-cloud-cli"
 
 apple_id {
   username = "maurizio.branca@gmail.com"
@@ -11,5 +11,5 @@ sign {
 }
 
 zip {
-  output_path = "./mariquita.zip"
+  output_path = "./iot-cloud-cli.zip"
 }
diff --git a/README.md b/README.md
index b804b564..e4126008 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Mariquita
+# iot-cloud-cli
 
-Mariquita is a virtual device for Arduino IoT Cloud for testing.
+The iot-cloud-cli is a virtual device for Arduino IoT Cloud for testing.
 
 ```
-$ mariquita ping -u "<deviceId>" -p "<secret>" -t <thing ID>>
+$ iot-cloud-cli ping -u "<deviceId>" -p "<secret>" -t <thing ID>>
   Connected to Arduino IoT Cloud
   Subscribed true
   Property value sent successfully 81
@@ -12,7 +12,7 @@ $ mariquita ping -u "<deviceId>" -p "<secret>" -t <thing ID>>
 
 ## Requirements
 
-This is all you need to use Mariquita:
+This is all you need to use iot-cloud-cli:
  * A "Generic ESP8266 Module" device in IoT Cloud (requires a Maker plan)
  * A thing with a `counter` property connected to the "Generic ESP8266 Module" device 
 
@@ -42,7 +42,7 @@ You should connect the new device to the new thing.
 ### Testing
 
 ```shell
-$ mariquita ping -u "<Device ID>" -p "<Secret Key>" -t <Thing ID>>
+$ iot-cloud-cli ping -u "<Device ID>" -p "<Secret Key>" -t <Thing ID>>
 ```
 
 If every works as expected you should see something similar to this output:
diff --git a/command/ping.go b/command/ping.go
index 7d8b7720..2be7cacb 100644
--- a/command/ping.go
+++ b/command/ping.go
@@ -9,10 +9,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/bcmi-labs/iot-cloud-cli/adapters/mqtt"
+	"github.com/bcmi-labs/iot-cloud-cli/internal/properties"
 	paho "github.com/eclipse/paho.mqtt.golang"
 	"github.com/spf13/cobra"
-	"github.com/zmoog/mariquita/adapters/mqtt"
-	"github.com/zmoog/mariquita/internal/properties"
 )
 
 var (
diff --git a/go.mod b/go.mod
index 75ef04d1..a58c3aa5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/zmoog/mariquita
+module github.com/bcmi-labs/iot-cloud-cli
 
 go 1.15
 
diff --git a/main.go b/main.go
index 531424b1..e973b9fc 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/zmoog/mariquita/command"
+import "github.com/bcmi-labs/iot-cloud-cli/command"
 
 func main() {
 	command.Execute()