chore(internal/provider): rename all structs to Provider

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Cyberghost{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Cyberghost),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Fastestvpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Fastestvpn),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &HideMyAss{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.HideMyAss),

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)
 }

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,

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Ipvanish{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Ipvanish),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Ivpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Ivpn),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Mullvad{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Mullvad),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Nordvpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Nordvpn),

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)

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Perfectprivacy{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Perfectprivacy),

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)

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Privado{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Privado),

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

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,

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)
 

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,

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)

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,

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Privatevpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Privatevpn),

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)

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Protonvpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Protonvpn),

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)

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,

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Purevpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Purevpn),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Surfshark{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Surfshark),

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)

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,

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Torguard{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Torguard),

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)
 }

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{

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Vyprvpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Vyprvpn),

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)
 }

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,

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Wevpn{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Wevpn),

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)

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,

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 {
+func New(servers []models.Server, randSource rand.Source) *Provider {
-	return &Windscribe{
+	return &Provider{
 		servers:         servers,
 		randSource:      randSource,
 		NoPortForwarder: utils.NewNoPortForwarding(providers.Windscribe),