diff --git a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go b/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go
index dd19da9e9..d07ed3c29 100644
--- a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go
+++ b/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/billing/v2beta1/billing_cli.go b/internal/namespaces/billing/v2beta1/billing_cli.go
index c7ac333e4..d2b13e19c 100644
--- a/internal/namespaces/billing/v2beta1/billing_cli.go
+++ b/internal/namespaces/billing/v2beta1/billing_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/block/v1alpha1/block_cli.go b/internal/namespaces/block/v1alpha1/block_cli.go
index 362d54f87..651af51c7 100644
--- a/internal/namespaces/block/v1alpha1/block_cli.go
+++ b/internal/namespaces/block/v1alpha1/block_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go
index eda02be3d..ff4fc4d23 100644
--- a/internal/namespaces/container/v1beta1/container_cli.go
+++ b/internal/namespaces/container/v1beta1/container_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/dedibox/v1/dedibox_cli.go b/internal/namespaces/dedibox/v1/dedibox_cli.go
index cda944987..a7b3dba68 100644
--- a/internal/namespaces/dedibox/v1/dedibox_cli.go
+++ b/internal/namespaces/dedibox/v1/dedibox_cli.go
@@ -23,7 +23,6 @@ func GetGeneratedCommands() *core.Commands {
 		dediboxServer(),
 		dediboxService(),
 		dediboxOffer(),
-		dediboxOption(),
 		dediboxOs(),
 		dediboxBmc(),
 		dediboxReverseIP(),
@@ -38,10 +37,10 @@ func GetGeneratedCommands() *core.Commands {
 		dediboxRpnV2(),
 		dediboxServerList(),
 		dediboxServerGet(),
-		dediboxOptionList(),
-		dediboxOptionSubscribe(),
+		dediboxServerListOptions(),
+		dediboxServerSubscribeOption(),
 		dediboxServerCreate(),
-		dediboxOptionSubscribeStorage(),
+		dediboxServerSubscribeStorage(),
 		dediboxServerUpdate(),
 		dediboxServerReboot(),
 		dediboxServerStart(),
@@ -167,15 +166,6 @@ func dediboxOffer() *core.Command {
 	}
 }
 
-func dediboxOption() *core.Command {
-	return &core.Command{
-		Short:     `Subscribable server options commands`,
-		Long:      `Subscribable server options commands.`,
-		Namespace: "dedibox",
-		Resource:  "option",
-	}
-}
-
 func dediboxOs() *core.Command {
 	return &core.Command{
 		Short:     `OS commands`,
@@ -368,13 +358,13 @@ func dediboxServerGet() *core.Command {
 	}
 }
 
-func dediboxOptionList() *core.Command {
+func dediboxServerListOptions() *core.Command {
 	return &core.Command{
 		Short:     `List subscribable server options`,
 		Long:      `List subscribable options associated to the given server ID.`,
 		Namespace: "dedibox",
-		Resource:  "option",
-		Verb:      "list",
+		Resource:  "server",
+		Verb:      "list-options",
 		// Deprecated:    false,
 		ArgsType: reflect.TypeOf(dedibox.ListSubscribableServerOptionsRequest{}),
 		ArgSpecs: core.ArgSpecs{
@@ -407,13 +397,13 @@ func dediboxOptionList() *core.Command {
 	}
 }
 
-func dediboxOptionSubscribe() *core.Command {
+func dediboxServerSubscribeOption() *core.Command {
 	return &core.Command{
 		Short:     `Subscribe server option`,
 		Long:      `Subscribe option for the given server ID.`,
 		Namespace: "dedibox",
-		Resource:  "option",
-		Verb:      "subscribe",
+		Resource:  "server",
+		Verb:      "subscribe-option",
 		// Deprecated:    false,
 		ArgsType: reflect.TypeOf(dedibox.SubscribeServerOptionRequest{}),
 		ArgSpecs: core.ArgSpecs{
@@ -489,12 +479,12 @@ func dediboxServerCreate() *core.Command {
 	}
 }
 
-func dediboxOptionSubscribeStorage() *core.Command {
+func dediboxServerSubscribeStorage() *core.Command {
 	return &core.Command{
 		Short:     `Subscribe storage server option`,
 		Long:      `Subscribe storage option for the given server ID.`,
 		Namespace: "dedibox",
-		Resource:  "option",
+		Resource:  "server",
 		Verb:      "subscribe-storage",
 		// Deprecated:    false,
 		ArgsType: reflect.TypeOf(dedibox.SubscribeStorageOptionsRequest{}),
diff --git a/internal/namespaces/documentdb/v1beta1/documentdb_cli.go b/internal/namespaces/documentdb/v1beta1/documentdb_cli.go
index 5bde9249f..6d90ed915 100644
--- a/internal/namespaces/documentdb/v1beta1/documentdb_cli.go
+++ b/internal/namespaces/documentdb/v1beta1/documentdb_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/domain/v2beta1/domain_cli.go b/internal/namespaces/domain/v2beta1/domain_cli.go
index 2475ddbe2..a67c991cc 100644
--- a/internal/namespaces/domain/v2beta1/domain_cli.go
+++ b/internal/namespaces/domain/v2beta1/domain_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go b/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go
index 15277451a..e22324e80 100644
--- a/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go
+++ b/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	edge_services "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go b/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
index c51be9726..1eb1ad361 100644
--- a/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
+++ b/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go
index 2ffe7a354..e9a0e15dd 100644
--- a/internal/namespaces/function/v1beta1/function_cli.go
+++ b/internal/namespaces/function/v1beta1/function_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/inference/v1beta1/inference_cli.go b/internal/namespaces/inference/v1beta1/inference_cli.go
index e1b516ad5..47efb75d6 100644
--- a/internal/namespaces/inference/v1beta1/inference_cli.go
+++ b/internal/namespaces/inference/v1beta1/inference_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go b/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go
index ff2a0b101..7be42e6b4 100644
--- a/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go
+++ b/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	ipfs "github.com/scaleway/scaleway-sdk-go/api/ipfs/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/ipfs/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/jobs/v1alpha1/jobs_cli.go b/internal/namespaces/jobs/v1alpha1/jobs_cli.go
index 784c98e76..3b9d6e002 100644
--- a/internal/namespaces/jobs/v1alpha1/jobs_cli.go
+++ b/internal/namespaces/jobs/v1alpha1/jobs_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	jobs "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/mnq/v1beta1/mnq_cli.go b/internal/namespaces/mnq/v1beta1/mnq_cli.go
index 6edf6c9e6..091bcf274 100644
--- a/internal/namespaces/mnq/v1beta1/mnq_cli.go
+++ b/internal/namespaces/mnq/v1beta1/mnq_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/secret/v1beta1/secret_cli.go b/internal/namespaces/secret/v1beta1/secret_cli.go
index 98192a3c2..2f2820150 100644
--- a/internal/namespaces/secret/v1beta1/secret_cli.go
+++ b/internal/namespaces/secret/v1beta1/secret_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	secret "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go b/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go
index df9166afd..e7a84d07c 100644
--- a/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go
+++ b/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	serverless_sqldb "github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go b/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go
index bb7d2eb01..9e72afc30 100644
--- a/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go
+++ b/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	webhosting "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/webhosting/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )