diff --git a/internal/metal/metal.go b/internal/metal/metal.go
index 1e567fc..b48c1c9 100644
--- a/internal/metal/metal.go
+++ b/internal/metal/metal.go
@@ -7,14 +7,14 @@ import (
 	"go.uber.org/zap"
 
 	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/models"
-	provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
+	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
 )
 
 // Client is the Equinix Metal API Client struct.
 type Client struct {
 	logger *zap.Logger
 
-	provider provider.Provider
+	provider providers.Provider
 }
 
 func (c *Client) GetOrganizationDetails(ctx context.Context, id gidx.PrefixedID) (*models.OrganizationDetails, error) {
diff --git a/internal/metal/options.go b/internal/metal/options.go
index 9360840..4d17efd 100644
--- a/internal/metal/options.go
+++ b/internal/metal/options.go
@@ -1,17 +1,18 @@
 package metal
 
 import (
-	provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
+	"go.uber.org/zap"
+
+	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
 	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emapi"
 	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emgql"
-	"go.uber.org/zap"
 )
 
 // Option is a Client configuration Option definition.
 type Option func(c *Client) error
 
 // WithProvider sets the provider on the client.
-func WithProvider(provider provider.Provider) Option {
+func WithProvider(provider providers.Provider) Option {
 	return func(c *Client) error {
 		c.provider = provider
 
diff --git a/internal/metal/providers/emapi/client.go b/internal/metal/providers/emapi/client.go
index b9372c7..98279b3 100644
--- a/internal/metal/providers/emapi/client.go
+++ b/internal/metal/providers/emapi/client.go
@@ -12,7 +12,7 @@ import (
 
 	"go.uber.org/zap"
 
-	provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
+	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
 )
 
 const (
@@ -29,7 +29,7 @@ var DefaultHTTPClient = &http.Client{
 	Timeout: defaultHTTPTimeout,
 }
 
-var _ provider.Provider = &Client{}
+var _ providers.Provider = &Client{}
 
 type Client struct {
 	logger        *zap.SugaredLogger
diff --git a/internal/metal/providers/emgql/client.go b/internal/metal/providers/emgql/client.go
index 965fb9a..2e992b3 100644
--- a/internal/metal/providers/emgql/client.go
+++ b/internal/metal/providers/emgql/client.go
@@ -5,21 +5,20 @@ import (
 	"net/url"
 	"time"
 
-	provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
 	"go.uber.org/zap"
+
+	"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
 )
 
 const (
 	defaultHTTPTimeout = 5 * time.Second
 )
 
-var (
-	DefaultHTTPClient = &http.Client{
-		Timeout: defaultHTTPTimeout,
-	}
-)
+var DefaultHTTPClient = &http.Client{
+	Timeout: defaultHTTPTimeout,
+}
 
-var _ provider.Provider = &Client{}
+var _ providers.Provider = &Client{}
 
 type Client struct {
 	logger     *zap.SugaredLogger
diff --git a/internal/metal/providers/provider.go b/internal/metal/providers/provider.go
index 0a99521..ddbc947 100644
--- a/internal/metal/providers/provider.go
+++ b/internal/metal/providers/provider.go
@@ -1,4 +1,4 @@
-package provider
+package providers
 
 import (
 	"context"