diff --git a/internal/provider/cyberghost/connection.go b/internal/provider/cyberghost/connection.go
index 28ee55d0..175d1237 100644
--- a/internal/provider/cyberghost/connection.go
+++ b/internal/provider/cyberghost/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (c *Cyberghost) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd
-	return utils.GetConnection(c.servers, selection, defaults, c.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/cyberghost/openvpnconf.go b/internal/provider/cyberghost/openvpnconf.go
index fd1b92e8..353da729 100644
--- a/internal/provider/cyberghost/openvpnconf.go
+++ b/internal/provider/cyberghost/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (c *Cyberghost) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/cyberghost/provider.go b/internal/provider/cyberghost/provider.go
index e89f3bd5..ab1cbf8e 100644
--- a/internal/provider/cyberghost/provider.go
+++ b/internal/provider/cyberghost/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Cyberghost struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Cyberghost {
-	return &Cyberghost{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Cyberghost),
diff --git a/internal/provider/fastestvpn/connection.go b/internal/provider/fastestvpn/connection.go
index 67d0d829..4a339d98 100644
--- a/internal/provider/fastestvpn/connection.go
+++ b/internal/provider/fastestvpn/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (f *Fastestvpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(4443, 4443, 0) //nolint:gomnd
-	return utils.GetConnection(f.servers, selection, defaults, f.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/fastestvpn/openvpnconf.go b/internal/provider/fastestvpn/openvpnconf.go
index 98c076ae..5d59c4d0 100644
--- a/internal/provider/fastestvpn/openvpnconf.go
+++ b/internal/provider/fastestvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (f *Fastestvpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/fastestvpn/provider.go b/internal/provider/fastestvpn/provider.go
index ef799fd9..b52c2479 100644
--- a/internal/provider/fastestvpn/provider.go
+++ b/internal/provider/fastestvpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Fastestvpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Fastestvpn {
-	return &Fastestvpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Fastestvpn),
diff --git a/internal/provider/hidemyass/connection.go b/internal/provider/hidemyass/connection.go
index 261eaf95..c6d7a1a0 100644
--- a/internal/provider/hidemyass/connection.go
+++ b/internal/provider/hidemyass/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (h *HideMyAss) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(8080, 553, 0) //nolint:gomnd
-	return utils.GetConnection(h.servers, selection, defaults, h.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/hidemyass/openvpnconf.go b/internal/provider/hidemyass/openvpnconf.go
index c428bf0a..137ece88 100644
--- a/internal/provider/hidemyass/openvpnconf.go
+++ b/internal/provider/hidemyass/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (h *HideMyAss) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/hidemyass/provider.go b/internal/provider/hidemyass/provider.go
index 663e5b2a..e744927d 100644
--- a/internal/provider/hidemyass/provider.go
+++ b/internal/provider/hidemyass/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type HideMyAss struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *HideMyAss {
-	return &HideMyAss{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.HideMyAss),
diff --git a/internal/provider/ipvanish/connection.go b/internal/provider/ipvanish/connection.go
index e680e1c3..162f2af8 100644
--- a/internal/provider/ipvanish/connection.go
+++ b/internal/provider/ipvanish/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (i *Ipvanish) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd
-	return utils.GetConnection(i.servers, selection, defaults, i.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/ipvanish/openvpnconf.go b/internal/provider/ipvanish/openvpnconf.go
index 2293c734..f58b9ce5 100644
--- a/internal/provider/ipvanish/openvpnconf.go
+++ b/internal/provider/ipvanish/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (i *Ipvanish) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
diff --git a/internal/provider/ipvanish/provider.go b/internal/provider/ipvanish/provider.go
index b0d7a518..beea984a 100644
--- a/internal/provider/ipvanish/provider.go
+++ b/internal/provider/ipvanish/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Ipvanish struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Ipvanish {
-	return &Ipvanish{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Ipvanish),
diff --git a/internal/provider/ivpn/connection.go b/internal/provider/ivpn/connection.go
index 9063f7c8..1ce0f826 100644
--- a/internal/provider/ivpn/connection.go
+++ b/internal/provider/ivpn/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (i *Ivpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 58237) //nolint:gomnd
-	return utils.GetConnection(i.servers, selection, defaults, i.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/ivpn/openvpnconf.go b/internal/provider/ivpn/openvpnconf.go
index 4a7702c0..8d85673b 100644
--- a/internal/provider/ivpn/openvpnconf.go
+++ b/internal/provider/ivpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (i *Ivpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/ivpn/provider.go b/internal/provider/ivpn/provider.go
index 5bd63796..48f61390 100644
--- a/internal/provider/ivpn/provider.go
+++ b/internal/provider/ivpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Ivpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Ivpn {
-	return &Ivpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Ivpn),
diff --git a/internal/provider/mullvad/connection.go b/internal/provider/mullvad/connection.go
index a21f189b..ecb1e086 100644
--- a/internal/provider/mullvad/connection.go
+++ b/internal/provider/mullvad/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (m *Mullvad) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 51820) //nolint:gomnd
-	return utils.GetConnection(m.servers, selection, defaults, m.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/mullvad/openvpnconf.go b/internal/provider/mullvad/openvpnconf.go
index d748bd89..c62518bb 100644
--- a/internal/provider/mullvad/openvpnconf.go
+++ b/internal/provider/mullvad/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (m *Mullvad) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/mullvad/provider.go b/internal/provider/mullvad/provider.go
index b00f24c2..bd274d7c 100644
--- a/internal/provider/mullvad/provider.go
+++ b/internal/provider/mullvad/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Mullvad struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Mullvad {
-	return &Mullvad{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Mullvad),
diff --git a/internal/provider/nordvpn/connection.go b/internal/provider/nordvpn/connection.go
index cce5e8fa..3175ef98 100644
--- a/internal/provider/nordvpn/connection.go
+++ b/internal/provider/nordvpn/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (n *Nordvpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
-	return utils.GetConnection(n.servers, selection, defaults, n.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/nordvpn/openvpnconf.go b/internal/provider/nordvpn/openvpnconf.go
index 0085e615..3d6dfa24 100644
--- a/internal/provider/nordvpn/openvpnconf.go
+++ b/internal/provider/nordvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (n *Nordvpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/nordvpn/provider.go b/internal/provider/nordvpn/provider.go
index fded20ba..e68dda2b 100644
--- a/internal/provider/nordvpn/provider.go
+++ b/internal/provider/nordvpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Nordvpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Nordvpn {
-	return &Nordvpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Nordvpn),
diff --git a/internal/provider/perfectprivacy/connection.go b/internal/provider/perfectprivacy/connection.go
index 70f78b16..6d6544e0 100644
--- a/internal/provider/perfectprivacy/connection.go
+++ b/internal/provider/perfectprivacy/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Perfectprivacy) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/perfectprivacy/openvpnconf.go b/internal/provider/perfectprivacy/openvpnconf.go
index 721778f9..f580869c 100644
--- a/internal/provider/perfectprivacy/openvpnconf.go
+++ b/internal/provider/perfectprivacy/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Perfectprivacy) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/perfectprivacy/provider.go b/internal/provider/perfectprivacy/provider.go
index 36b15778..85cf6d8a 100644
--- a/internal/provider/perfectprivacy/provider.go
+++ b/internal/provider/perfectprivacy/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Perfectprivacy struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Perfectprivacy {
-	return &Perfectprivacy{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Perfectprivacy),
diff --git a/internal/provider/privado/connection.go b/internal/provider/privado/connection.go
index 3817f215..bbc41cd5 100644
--- a/internal/provider/privado/connection.go
+++ b/internal/provider/privado/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Privado) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(0, 1194, 0) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/privado/openvpnconf.go b/internal/provider/privado/openvpnconf.go
index dc024a21..9d457dbd 100644
--- a/internal/provider/privado/openvpnconf.go
+++ b/internal/provider/privado/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Privado) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/privado/provider.go b/internal/provider/privado/provider.go
index c740d256..a736fcd3 100644
--- a/internal/provider/privado/provider.go
+++ b/internal/provider/privado/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Privado struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Privado {
-	return &Privado{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Privado),
diff --git a/internal/provider/privateinternetaccess/connection.go b/internal/provider/privateinternetaccess/connection.go
index cb720c66..97c9891e 100644
--- a/internal/provider/privateinternetaccess/connection.go
+++ b/internal/provider/privateinternetaccess/connection.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *PIA) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	// Set port defaults depending on encryption preset.
 	var defaults utils.ConnectionDefaults
diff --git a/internal/provider/privateinternetaccess/openvpnconf.go b/internal/provider/privateinternetaccess/openvpnconf.go
index 294710b4..be003d16 100644
--- a/internal/provider/privateinternetaccess/openvpnconf.go
+++ b/internal/provider/privateinternetaccess/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *PIA) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/privateinternetaccess/portforward.go b/internal/provider/privateinternetaccess/portforward.go
index f0d07dd4..3d0d3f9b 100644
--- a/internal/provider/privateinternetaccess/portforward.go
+++ b/internal/provider/privateinternetaccess/portforward.go
@@ -26,7 +26,7 @@ var (
 )
 
 // PortForward obtains a VPN server side port forwarded from PIA.
-func (p *PIA) PortForward(ctx context.Context, client *http.Client,
+func (p *Provider) PortForward(ctx context.Context, client *http.Client,
 	logger utils.Logger, gateway net.IP, serverName string) (
 	port uint16, err error) {
 	var server models.Server
@@ -90,7 +90,7 @@ var (
 	ErrPortForwardedExpired = errors.New("port forwarded data expired")
 )
 
-func (p *PIA) KeepPortForward(ctx context.Context, client *http.Client,
+func (p *Provider) KeepPortForward(ctx context.Context, client *http.Client,
 	port uint16, gateway net.IP, serverName string) (err error) {
 	privateIPClient := newHTTPClient(serverName)
 
diff --git a/internal/provider/privateinternetaccess/provider.go b/internal/provider/privateinternetaccess/provider.go
index 2603679f..8fc56e8c 100644
--- a/internal/provider/privateinternetaccess/provider.go
+++ b/internal/provider/privateinternetaccess/provider.go
@@ -8,7 +8,7 @@ import (
 	"github.com/qdm12/gluetun/internal/models"
 )
 
-type PIA struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	timeNow    func() time.Time
@@ -18,9 +18,9 @@ type PIA struct {
 }
 
 func New(servers []models.Server, randSource rand.Source,
-	timeNow func() time.Time) *PIA {
+	timeNow func() time.Time) *Provider {
 	const jsonPortForwardPath = "/gluetun/piaportforward.json"
-	return &PIA{
+	return &Provider{
 		servers:         servers,
 		timeNow:         timeNow,
 		randSource:      randSource,
diff --git a/internal/provider/privatevpn/connection.go b/internal/provider/privatevpn/connection.go
index 7a9d87a9..8b464de5 100644
--- a/internal/provider/privatevpn/connection.go
+++ b/internal/provider/privatevpn/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Privatevpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/privatevpn/openvpnconf.go b/internal/provider/privatevpn/openvpnconf.go
index 3aaef558..2ce39cfc 100644
--- a/internal/provider/privatevpn/openvpnconf.go
+++ b/internal/provider/privatevpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Privatevpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/privatevpn/provider.go b/internal/provider/privatevpn/provider.go
index fd77eb9e..c3c4f880 100644
--- a/internal/provider/privatevpn/provider.go
+++ b/internal/provider/privatevpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Privatevpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Privatevpn {
-	return &Privatevpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Privatevpn),
diff --git a/internal/provider/protonvpn/connection.go b/internal/provider/protonvpn/connection.go
index 78d5a197..8dc65c91 100644
--- a/internal/provider/protonvpn/connection.go
+++ b/internal/provider/protonvpn/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Protonvpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/protonvpn/openvpnconf.go b/internal/provider/protonvpn/openvpnconf.go
index 42cab2c3..b7338b35 100644
--- a/internal/provider/protonvpn/openvpnconf.go
+++ b/internal/provider/protonvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Protonvpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/protonvpn/provider.go b/internal/provider/protonvpn/provider.go
index a5fa95a8..2ba2d3f4 100644
--- a/internal/provider/protonvpn/provider.go
+++ b/internal/provider/protonvpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Protonvpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Protonvpn {
-	return &Protonvpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Protonvpn),
diff --git a/internal/provider/purevpn/connection.go b/internal/provider/purevpn/connection.go
index 43681163..c49a54ba 100644
--- a/internal/provider/purevpn/connection.go
+++ b/internal/provider/purevpn/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Purevpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(80, 53, 0) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/purevpn/openvpnconf.go b/internal/provider/purevpn/openvpnconf.go
index 9d1b046c..5110c8ee 100644
--- a/internal/provider/purevpn/openvpnconf.go
+++ b/internal/provider/purevpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Purevpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/purevpn/provider.go b/internal/provider/purevpn/provider.go
index 145d6ae0..abb9b78e 100644
--- a/internal/provider/purevpn/provider.go
+++ b/internal/provider/purevpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Purevpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Purevpn {
-	return &Purevpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Purevpn),
diff --git a/internal/provider/surfshark/connection.go b/internal/provider/surfshark/connection.go
index 56f747f7..66f69f15 100644
--- a/internal/provider/surfshark/connection.go
+++ b/internal/provider/surfshark/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (s *Surfshark) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(1443, 1194, 0) //nolint:gomnd
-	return utils.GetConnection(s.servers, selection, defaults, s.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/surfshark/openvpnconf.go b/internal/provider/surfshark/openvpnconf.go
index c8429b91..ef3b492a 100644
--- a/internal/provider/surfshark/openvpnconf.go
+++ b/internal/provider/surfshark/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (s *Surfshark) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/surfshark/provider.go b/internal/provider/surfshark/provider.go
index 66e009d4..6e9a765f 100644
--- a/internal/provider/surfshark/provider.go
+++ b/internal/provider/surfshark/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Surfshark struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Surfshark {
-	return &Surfshark{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Surfshark),
diff --git a/internal/provider/torguard/connection.go b/internal/provider/torguard/connection.go
index 9dd8474d..6ebb4782 100644
--- a/internal/provider/torguard/connection.go
+++ b/internal/provider/torguard/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Torguard) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(1912, 1912, 0) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/torguard/openvpnconf.go b/internal/provider/torguard/openvpnconf.go
index 73b15cdd..6b9c1f59 100644
--- a/internal/provider/torguard/openvpnconf.go
+++ b/internal/provider/torguard/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (t *Torguard) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/torguard/provider.go b/internal/provider/torguard/provider.go
index 5fe7affc..f36806dc 100644
--- a/internal/provider/torguard/provider.go
+++ b/internal/provider/torguard/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Torguard struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Torguard {
-	return &Torguard{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Torguard),
diff --git a/internal/provider/vyprvpn/connection.go b/internal/provider/vyprvpn/connection.go
index f2b38bd9..544055b6 100644
--- a/internal/provider/vyprvpn/connection.go
+++ b/internal/provider/vyprvpn/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (v *Vyprvpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd
-	return utils.GetConnection(v.servers, selection, defaults, v.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/vyprvpn/openvpnconf.go b/internal/provider/vyprvpn/openvpnconf.go
index d1bf3685..5aca5909 100644
--- a/internal/provider/vyprvpn/openvpnconf.go
+++ b/internal/provider/vyprvpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (v *Vyprvpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
diff --git a/internal/provider/vyprvpn/provider.go b/internal/provider/vyprvpn/provider.go
index 1068d062..6b37d68e 100644
--- a/internal/provider/vyprvpn/provider.go
+++ b/internal/provider/vyprvpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Vyprvpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Vyprvpn {
-	return &Vyprvpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Vyprvpn),
diff --git a/internal/provider/wevpn/connection.go b/internal/provider/wevpn/connection.go
index 6b789efe..cb235c57 100644
--- a/internal/provider/wevpn/connection.go
+++ b/internal/provider/wevpn/connection.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (w *Wevpn) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(1195, 1194, 0) //nolint:gomnd
-	return utils.GetConnection(w.servers, selection, defaults, w.randSource)
+	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
 }
diff --git a/internal/provider/wevpn/openvpnconf.go b/internal/provider/wevpn/openvpnconf.go
index de2ac659..c89e2f96 100644
--- a/internal/provider/wevpn/openvpnconf.go
+++ b/internal/provider/wevpn/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (w *Wevpn) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/wevpn/provider.go b/internal/provider/wevpn/provider.go
index 156342ba..960383ea 100644
--- a/internal/provider/wevpn/provider.go
+++ b/internal/provider/wevpn/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Wevpn struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Wevpn {
-	return &Wevpn{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Wevpn),
diff --git a/internal/provider/windscribe/connection.go b/internal/provider/windscribe/connection.go
index 821c5a1a..f70c9ea6 100644
--- a/internal/provider/windscribe/connection.go
+++ b/internal/provider/windscribe/connection.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (p *Windscribe) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 1194) //nolint:gomnd
 	return utils.GetConnection(p.servers, selection, defaults, p.randSource)
diff --git a/internal/provider/windscribe/openvpnconf.go b/internal/provider/windscribe/openvpnconf.go
index 7800357a..6e527a63 100644
--- a/internal/provider/windscribe/openvpnconf.go
+++ b/internal/provider/windscribe/openvpnconf.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-func (w *Windscribe) BuildConf(connection models.Connection,
+func (p *Provider) BuildConf(connection models.Connection,
 	settings settings.OpenVPN) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
diff --git a/internal/provider/windscribe/provider.go b/internal/provider/windscribe/provider.go
index d794d7c5..e8adc1de 100644
--- a/internal/provider/windscribe/provider.go
+++ b/internal/provider/windscribe/provider.go
@@ -8,14 +8,14 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
-type Windscribe struct {
+type Provider struct {
 	servers    []models.Server
 	randSource rand.Source
 	utils.NoPortForwarder
 }
 
-func New(servers []models.Server, randSource rand.Source) *Windscribe {
-	return &Windscribe{
+func New(servers []models.Server, randSource rand.Source) *Provider {
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Windscribe),