diff --git a/collector/ad.go b/collector/ad.go
index 42122c1f..c2060c4c 100644
--- a/collector/ad.go
+++ b/collector/ad.go
@@ -76,8 +76,8 @@ type ADCollector struct {
 	TombstonedObjectsVisitedTotal                       *prometheus.Desc
 }
 
-// NewADCollector ...
-func NewADCollector() (Collector, error) {
+// newADCollector ...
+func newADCollector() (Collector, error) {
 	const subsystem = "ad"
 	return &ADCollector{
 		AddressBookOperationsTotal: prometheus.NewDesc(
diff --git a/collector/ad_test.go b/collector/ad_test.go
index 6bb13e48..b2d1b696 100644
--- a/collector/ad_test.go
+++ b/collector/ad_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkADCollector(b *testing.B) {
-	benchmarkCollector(b, "ad", NewADCollector)
+	benchmarkCollector(b, "ad", newADCollector)
 }
diff --git a/collector/container.go b/collector/container.go
index 2812cec1..4a3088f4 100644
--- a/collector/container.go
+++ b/collector/container.go
@@ -41,8 +41,8 @@ type ContainerMetricsCollector struct {
 	WriteSizeBytes       *prometheus.Desc
 }
 
-// NewContainerMetricsCollector constructs a new ContainerMetricsCollector
-func NewContainerMetricsCollector() (Collector, error) {
+// newContainerMetricsCollector constructs a new ContainerMetricsCollector
+func newContainerMetricsCollector() (Collector, error) {
 	const subsystem = "container"
 	return &ContainerMetricsCollector{
 		ContainerAvailable: prometheus.NewDesc(
diff --git a/collector/container_test.go b/collector/container_test.go
index 4da471b8..002f38ad 100644
--- a/collector/container_test.go
+++ b/collector/container_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkContainerCollector(b *testing.B) {
-	benchmarkCollector(b, "container", NewContainerMetricsCollector)
+	benchmarkCollector(b, "container", newContainerMetricsCollector)
 }
diff --git a/collector/cs.go b/collector/cs.go
index df768faa..2207960e 100644
--- a/collector/cs.go
+++ b/collector/cs.go
@@ -17,8 +17,8 @@ type CSCollector struct {
 	Hostname            *prometheus.Desc
 }
 
-// NewCSCollector ...
-func NewCSCollector() (Collector, error) {
+// newCSCollector ...
+func newCSCollector() (Collector, error) {
 	const subsystem = "cs"
 
 	return &CSCollector{
diff --git a/collector/cs_test.go b/collector/cs_test.go
index b1f3f073..08160290 100644
--- a/collector/cs_test.go
+++ b/collector/cs_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkCsCollector(b *testing.B) {
-	benchmarkCollector(b, "cs", NewCSCollector)
+	benchmarkCollector(b, "cs", newCSCollector)
 }
diff --git a/collector/dfsr.go b/collector/dfsr.go
index e9198ef8..0874ec69 100644
--- a/collector/dfsr.go
+++ b/collector/dfsr.go
@@ -82,8 +82,8 @@ func dfsrGetPerfObjectName(collector string) string {
 	return (prefix + suffix)
 }
 
-// NewDFSRCollector is registered
-func NewDFSRCollector() (Collector, error) {
+// newDFSRCollector is registered
+func newDFSRCollector() (Collector, error) {
 	log.Info("dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
 	const subsystem = "dfsr"
 
diff --git a/collector/dfsr_test.go b/collector/dfsr_test.go
index 2cc338f9..fd24a63b 100644
--- a/collector/dfsr_test.go
+++ b/collector/dfsr_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkDFSRCollector(b *testing.B) {
-	benchmarkCollector(b, "dfsr", NewDFSRCollector)
+	benchmarkCollector(b, "dfsr", newDFSRCollector)
 }
diff --git a/collector/dhcp.go b/collector/dhcp.go
index 09c8ba0e..24dd7d1e 100644
--- a/collector/dhcp.go
+++ b/collector/dhcp.go
@@ -36,7 +36,7 @@ type DhcpCollector struct {
 	FailoverBndupdDropped                            *prometheus.Desc
 }
 
-func NewDhcpCollector() (Collector, error) {
+func newDhcpCollector() (Collector, error) {
 	const subsystem = "dhcp"
 
 	return &DhcpCollector{
diff --git a/collector/dhcp_test.go b/collector/dhcp_test.go
index 98956d93..1c8b717b 100644
--- a/collector/dhcp_test.go
+++ b/collector/dhcp_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkDHCPCollector(b *testing.B) {
-	benchmarkCollector(b, "dhcp", NewDhcpCollector)
+	benchmarkCollector(b, "dhcp", newDhcpCollector)
 }
diff --git a/collector/dns.go b/collector/dns.go
index 472cd842..49392e68 100644
--- a/collector/dns.go
+++ b/collector/dns.go
@@ -37,8 +37,8 @@ type DNSCollector struct {
 	UnmatchedResponsesReceived    *prometheus.Desc
 }
 
-// NewDNSCollector ...
-func NewDNSCollector() (Collector, error) {
+// newDNSCollector ...
+func newDNSCollector() (Collector, error) {
 	const subsystem = "dns"
 	return &DNSCollector{
 		ZoneTransferRequestsReceived: prometheus.NewDesc(
diff --git a/collector/dns_test.go b/collector/dns_test.go
index efb778c4..9f42945f 100644
--- a/collector/dns_test.go
+++ b/collector/dns_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkDNSCollector(b *testing.B) {
-	benchmarkCollector(b, "dns", NewDNSCollector)
+	benchmarkCollector(b, "dns", newDNSCollector)
 }
diff --git a/collector/hyperv.go b/collector/hyperv.go
index 74d24936..da749123 100644
--- a/collector/hyperv.go
+++ b/collector/hyperv.go
@@ -126,8 +126,8 @@ type HyperVCollector struct {
 	VMMemoryRemovedMemory              *prometheus.Desc
 }
 
-// NewHyperVCollector ...
-func NewHyperVCollector() (Collector, error) {
+// newHyperVCollector ...
+func newHyperVCollector() (Collector, error) {
 	buildSubsystemName := func(component string) string { return "hyperv_" + component }
 	return &HyperVCollector{
 		HealthCritical: prometheus.NewDesc(
diff --git a/collector/hyperv_test.go b/collector/hyperv_test.go
index c8a9dc59..1898965e 100644
--- a/collector/hyperv_test.go
+++ b/collector/hyperv_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkHypervCollector(b *testing.B) {
-	benchmarkCollector(b, "hyperv", NewHyperVCollector)
+	benchmarkCollector(b, "hyperv", newHyperVCollector)
 }
diff --git a/collector/iis.go b/collector/iis.go
index ed95bfff..fc691da0 100644
--- a/collector/iis.go
+++ b/collector/iis.go
@@ -191,7 +191,7 @@ type IISCollector struct {
 	iis_version simple_version
 }
 
-func NewIISCollector() (Collector, error) {
+func newIISCollector() (Collector, error) {
 	const subsystem = "iis"
 
 	return &IISCollector{
diff --git a/collector/iis_test.go b/collector/iis_test.go
index 746b27be..67880cde 100644
--- a/collector/iis_test.go
+++ b/collector/iis_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkIISCollector(b *testing.B) {
-	benchmarkCollector(b, "iis", NewIISCollector)
+	benchmarkCollector(b, "iis", newIISCollector)
 }
diff --git a/collector/init.go b/collector/init.go
index ecb10ad7..c225a90c 100644
--- a/collector/init.go
+++ b/collector/init.go
@@ -33,7 +33,7 @@ func getDFSRCollectorDeps() []string {
 var collectors = []collectorInit{
 	{
 		name:             "ad",
-		builder:          NewADCollector,
+		builder:          newADCollector,
 		perfCounterNames: nil,
 	},
 	{
@@ -53,7 +53,7 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "container",
-		builder:          NewContainerMetricsCollector,
+		builder:          newContainerMetricsCollector,
 		perfCounterNames: nil,
 	},
 	{
@@ -68,17 +68,17 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "cs",
-		builder:          NewCSCollector,
+		builder:          newCSCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "dfsr",
-		builder:          NewDFSRCollector,
+		builder:          newDFSRCollector,
 		perfCounterNames: getDFSRCollectorDeps(),
 	},
 	{
 		name:             "dhcp",
-		builder:          NewDhcpCollector,
+		builder:          newDhcpCollector,
 		perfCounterNames: nil,
 	},
 	{
@@ -88,7 +88,7 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "dns",
-		builder:          NewDNSCollector,
+		builder:          newDNSCollector,
 		perfCounterNames: nil,
 	},
 	{
@@ -113,12 +113,12 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "hyperv",
-		builder:          NewHyperVCollector,
+		builder:          newHyperVCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:    "iis",
-		builder: NewIISCollector,
+		builder: newIISCollector,
 		perfCounterNames: []string{"Web Service",
 			"APP_POOL_WAS",
 			"Web Service Cache",
@@ -127,17 +127,17 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "logical_disk",
-		builder:          NewLogicalDiskCollector,
+		builder:          newLogicalDiskCollector,
 		perfCounterNames: []string{"LogicalDisk"},
 	},
 	{
 		name:             "logon",
-		builder:          NewLogonCollector,
+		builder:          newLogonCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "memory",
-		builder:          NewMemoryCollector,
+		builder:          newMemoryCollector,
 		perfCounterNames: []string{"Memory"},
 	},
 	{
@@ -167,62 +167,62 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "msmq",
-		builder:          NewMSMQCollector,
+		builder:          newMSMQCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "mssql",
-		builder:          NewMSSQLCollector,
+		builder:          newMSSQLCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "net",
-		builder:          NewNetworkCollector,
+		builder:          newNetworkCollector,
 		perfCounterNames: []string{"Network Interface"},
 	},
 	{
 		name:             "netframework_clrexceptions",
-		builder:          NewNETFramework_NETCLRExceptionsCollector,
+		builder:          newNETFramework_NETCLRExceptionsCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrinterop",
-		builder:          NewNETFramework_NETCLRInteropCollector,
+		builder:          newNETFramework_NETCLRInteropCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrjit",
-		builder:          NewNETFramework_NETCLRJitCollector,
+		builder:          newNETFramework_NETCLRJitCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrloading",
-		builder:          NewNETFramework_NETCLRLoadingCollector,
+		builder:          newNETFramework_NETCLRLoadingCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrlocksandthreads",
-		builder:          NewNETFramework_NETCLRLocksAndThreadsCollector,
+		builder:          newNETFramework_NETCLRLocksAndThreadsCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrmemory",
-		builder:          NewNETFramework_NETCLRMemoryCollector,
+		builder:          newNETFramework_NETCLRMemoryCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrremoting",
-		builder:          NewNETFramework_NETCLRRemotingCollector,
+		builder:          newNETFramework_NETCLRRemotingCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "netframework_clrsecurity",
-		builder:          NewNETFramework_NETCLRSecurityCollector,
+		builder:          newNETFramework_NETCLRSecurityCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "os",
-		builder:          NewOSCollector,
+		builder:          newOSCollector,
 		perfCounterNames: []string{"Paging File"},
 	},
 	{
@@ -232,27 +232,27 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "remote_fx",
-		builder:          NewRemoteFx,
+		builder:          newRemoteFx,
 		perfCounterNames: []string{"RemoteFX Network"},
 	},
 	{
 		name:             "scheduled_task",
-		builder:          NewScheduledTask,
+		builder:          newScheduledTask,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "service",
-		builder:          NewserviceCollector,
+		builder:          newserviceCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "smtp",
-		builder:          NewSMTPCollector,
+		builder:          newSMTPCollector,
 		perfCounterNames: []string{"SMTP Server"},
 	},
 	{
 		name:             "system",
-		builder:          NewSystemCollector,
+		builder:          newSystemCollector,
 		perfCounterNames: []string{"System"},
 	},
 	{
@@ -262,12 +262,12 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "tcp",
-		builder:          NewTCPCollector,
+		builder:          newTCPCollector,
 		perfCounterNames: []string{"TCPv4"},
 	},
 	{
 		name:    "terminal_services",
-		builder: NewTerminalServicesCollector,
+		builder: newTerminalServicesCollector,
 		perfCounterNames: []string{
 			"Terminal Services",
 			"Terminal Services Session",
@@ -276,12 +276,12 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "textfile",
-		builder:          NewTextFileCollector,
+		builder:          newTextFileCollector,
 		perfCounterNames: nil,
 	},
 	{
 		name:             "thermalzone",
-		builder:          NewThermalZoneCollector,
+		builder:          newThermalZoneCollector,
 		perfCounterNames: nil,
 	},
 	{
@@ -291,7 +291,7 @@ var collectors = []collectorInit{
 	},
 	{
 		name:             "vmware",
-		builder:          NewVmwareCollector,
+		builder:          newVmwareCollector,
 		perfCounterNames: nil,
 	},
 	{
diff --git a/collector/logical_disk.go b/collector/logical_disk.go
index 89990df2..7ecdd06b 100644
--- a/collector/logical_disk.go
+++ b/collector/logical_disk.go
@@ -46,8 +46,8 @@ type LogicalDiskCollector struct {
 	volumeBlacklistPattern *regexp.Regexp
 }
 
-// NewLogicalDiskCollector ...
-func NewLogicalDiskCollector() (Collector, error) {
+// newLogicalDiskCollector ...
+func newLogicalDiskCollector() (Collector, error) {
 	const subsystem = "logical_disk"
 
 	return &LogicalDiskCollector{
diff --git a/collector/logical_disk_test.go b/collector/logical_disk_test.go
index 96c50e22..0d43d4bb 100644
--- a/collector/logical_disk_test.go
+++ b/collector/logical_disk_test.go
@@ -9,5 +9,5 @@ func BenchmarkLogicalDiskCollector(b *testing.B) {
 	localVolumeWhitelist := ".+"
 	volumeWhitelist = &localVolumeWhitelist
 
-	benchmarkCollector(b, "logical_disk", NewLogicalDiskCollector)
+	benchmarkCollector(b, "logical_disk", newLogicalDiskCollector)
 }
diff --git a/collector/logon.go b/collector/logon.go
index fe94fd34..20293e71 100644
--- a/collector/logon.go
+++ b/collector/logon.go
@@ -16,8 +16,8 @@ type LogonCollector struct {
 	LogonType *prometheus.Desc
 }
 
-// NewLogonCollector ...
-func NewLogonCollector() (Collector, error) {
+// newLogonCollector ...
+func newLogonCollector() (Collector, error) {
 	const subsystem = "logon"
 
 	return &LogonCollector{
diff --git a/collector/logon_test.go b/collector/logon_test.go
index 42f452aa..423d083c 100644
--- a/collector/logon_test.go
+++ b/collector/logon_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkLogonCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewLogonCollector)
+	benchmarkCollector(b, "", newLogonCollector)
 }
diff --git a/collector/memory.go b/collector/memory.go
index e216d21b..b439e2c6 100644
--- a/collector/memory.go
+++ b/collector/memory.go
@@ -47,8 +47,8 @@ type MemoryCollector struct {
 	WriteCopiesTotal                *prometheus.Desc
 }
 
-// NewMemoryCollector ...
-func NewMemoryCollector() (Collector, error) {
+// newMemoryCollector ...
+func newMemoryCollector() (Collector, error) {
 	const subsystem = "memory"
 
 	return &MemoryCollector{
diff --git a/collector/memory_test.go b/collector/memory_test.go
index 76cb8765..8dd5e924 100644
--- a/collector/memory_test.go
+++ b/collector/memory_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkMemoryCollector(b *testing.B) {
-	benchmarkCollector(b, "memory", NewMemoryCollector)
+	benchmarkCollector(b, "memory", newMemoryCollector)
 }
diff --git a/collector/msmq.go b/collector/msmq.go
index 66d0137f..fdbc9799 100644
--- a/collector/msmq.go
+++ b/collector/msmq.go
@@ -27,7 +27,7 @@ type Win32_PerfRawData_MSMQ_MSMQQueueCollector struct {
 }
 
 // NewWin32_PerfRawData_MSMQ_MSMQQueueCollector ...
-func NewMSMQCollector() (Collector, error) {
+func newMSMQCollector() (Collector, error) {
 	const subsystem = "msmq"
 
 	if *msmqWhereClause == "" {
diff --git a/collector/msmq_test.go b/collector/msmq_test.go
index 4c3bccad..86512bf8 100644
--- a/collector/msmq_test.go
+++ b/collector/msmq_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkMsmqCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewMSMQCollector)
+	benchmarkCollector(b, "", newMSMQCollector)
 }
diff --git a/collector/mssql.go b/collector/mssql.go
index 50d1d8b2..e86721ea 100644
--- a/collector/mssql.go
+++ b/collector/mssql.go
@@ -401,8 +401,8 @@ type MSSQLCollector struct {
 	mssqlChildCollectorFailure int
 }
 
-// NewMSSQLCollector ...
-func NewMSSQLCollector() (Collector, error) {
+// newMSSQLCollector ...
+func newMSSQLCollector() (Collector, error) {
 
 	const subsystem = "mssql"
 
diff --git a/collector/mssql_test.go b/collector/mssql_test.go
index 4929bf23..5230a72b 100644
--- a/collector/mssql_test.go
+++ b/collector/mssql_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkMSSQLCollector(b *testing.B) {
-	benchmarkCollector(b, "mssql", NewMSSQLCollector)
+	benchmarkCollector(b, "mssql", newMSSQLCollector)
 }
diff --git a/collector/net.go b/collector/net.go
index 41d54dc4..6c3e65d9 100644
--- a/collector/net.go
+++ b/collector/net.go
@@ -44,8 +44,8 @@ type NetworkCollector struct {
 	nicBlacklistPattern *regexp.Regexp
 }
 
-// NewNetworkCollector ...
-func NewNetworkCollector() (Collector, error) {
+// newNetworkCollector ...
+func newNetworkCollector() (Collector, error) {
 	const subsystem = "net"
 
 	return &NetworkCollector{
diff --git a/collector/net_test.go b/collector/net_test.go
index c28e0426..ac535d38 100644
--- a/collector/net_test.go
+++ b/collector/net_test.go
@@ -23,5 +23,5 @@ func BenchmarkNetCollector(b *testing.B) {
 	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all interfaces.
 	localNicWhitelist := ".+"
 	nicWhitelist = &localNicWhitelist
-	benchmarkCollector(b, "net", NewNetworkCollector)
+	benchmarkCollector(b, "net", newNetworkCollector)
 }
diff --git a/collector/netframework_clrexceptions.go b/collector/netframework_clrexceptions.go
index a8acbaf5..85af24c9 100644
--- a/collector/netframework_clrexceptions.go
+++ b/collector/netframework_clrexceptions.go
@@ -17,8 +17,8 @@ type NETFramework_NETCLRExceptionsCollector struct {
 	ThrowToCatchDepth    *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRExceptionsCollector ...
-func NewNETFramework_NETCLRExceptionsCollector() (Collector, error) {
+// newNETFramework_NETCLRExceptionsCollector ...
+func newNETFramework_NETCLRExceptionsCollector() (Collector, error) {
 	const subsystem = "netframework_clrexceptions"
 	return &NETFramework_NETCLRExceptionsCollector{
 		NumberofExcepsThrown: prometheus.NewDesc(
diff --git a/collector/netframework_clrexceptions_test.go b/collector/netframework_clrexceptions_test.go
index 5174b255..a9f3512b 100644
--- a/collector/netframework_clrexceptions_test.go
+++ b/collector/netframework_clrexceptions_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNetFrameworkNETCLRExceptionsCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRExceptionsCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRExceptionsCollector)
 }
diff --git a/collector/netframework_clrinterop.go b/collector/netframework_clrinterop.go
index 9906bef8..1703af30 100644
--- a/collector/netframework_clrinterop.go
+++ b/collector/netframework_clrinterop.go
@@ -16,8 +16,8 @@ type NETFramework_NETCLRInteropCollector struct {
 	NumberofStubs       *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRInteropCollector ...
-func NewNETFramework_NETCLRInteropCollector() (Collector, error) {
+// newNETFramework_NETCLRInteropCollector ...
+func newNETFramework_NETCLRInteropCollector() (Collector, error) {
 	const subsystem = "netframework_clrinterop"
 	return &NETFramework_NETCLRInteropCollector{
 		NumberofCCWs: prometheus.NewDesc(
diff --git a/collector/netframework_clrinterop_test.go b/collector/netframework_clrinterop_test.go
index 73db090c..ff94d91c 100644
--- a/collector/netframework_clrinterop_test.go
+++ b/collector/netframework_clrinterop_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRInteropCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRInteropCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRInteropCollector)
 }
diff --git a/collector/netframework_clrjit.go b/collector/netframework_clrjit.go
index f857614b..acae847f 100644
--- a/collector/netframework_clrjit.go
+++ b/collector/netframework_clrjit.go
@@ -17,8 +17,8 @@ type NETFramework_NETCLRJitCollector struct {
 	TotalNumberofILBytesJitted *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRJitCollector ...
-func NewNETFramework_NETCLRJitCollector() (Collector, error) {
+// newNETFramework_NETCLRJitCollector ...
+func newNETFramework_NETCLRJitCollector() (Collector, error) {
 	const subsystem = "netframework_clrjit"
 	return &NETFramework_NETCLRJitCollector{
 		NumberofMethodsJitted: prometheus.NewDesc(
diff --git a/collector/netframework_clrjit_test.go b/collector/netframework_clrjit_test.go
index 44daa0fe..05a3296d 100644
--- a/collector/netframework_clrjit_test.go
+++ b/collector/netframework_clrjit_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRJitCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRJitCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRJitCollector)
 }
diff --git a/collector/netframework_clrloading.go b/collector/netframework_clrloading.go
index 5a86f933..94f0d36a 100644
--- a/collector/netframework_clrloading.go
+++ b/collector/netframework_clrloading.go
@@ -22,8 +22,8 @@ type NETFramework_NETCLRLoadingCollector struct {
 	TotalNumberofLoadFailures *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRLoadingCollector ...
-func NewNETFramework_NETCLRLoadingCollector() (Collector, error) {
+// newNETFramework_NETCLRLoadingCollector ...
+func newNETFramework_NETCLRLoadingCollector() (Collector, error) {
 	const subsystem = "netframework_clrloading"
 	return &NETFramework_NETCLRLoadingCollector{
 		BytesinLoaderHeap: prometheus.NewDesc(
diff --git a/collector/netframework_clrloading_test.go b/collector/netframework_clrloading_test.go
index 20216261..8ea1974a 100644
--- a/collector/netframework_clrloading_test.go
+++ b/collector/netframework_clrloading_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRLoadingCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRLoadingCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRLoadingCollector)
 }
diff --git a/collector/netframework_clrlocksandthreads.go b/collector/netframework_clrlocksandthreads.go
index 6e0a46b0..5be02228 100644
--- a/collector/netframework_clrlocksandthreads.go
+++ b/collector/netframework_clrlocksandthreads.go
@@ -20,8 +20,8 @@ type NETFramework_NETCLRLocksAndThreadsCollector struct {
 	TotalNumberofContentions         *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRLocksAndThreadsCollector ...
-func NewNETFramework_NETCLRLocksAndThreadsCollector() (Collector, error) {
+// newNETFramework_NETCLRLocksAndThreadsCollector ...
+func newNETFramework_NETCLRLocksAndThreadsCollector() (Collector, error) {
 	const subsystem = "netframework_clrlocksandthreads"
 	return &NETFramework_NETCLRLocksAndThreadsCollector{
 		CurrentQueueLength: prometheus.NewDesc(
diff --git a/collector/netframework_clrlocksandthreads_test.go b/collector/netframework_clrlocksandthreads_test.go
index 164739c1..4e169d66 100644
--- a/collector/netframework_clrlocksandthreads_test.go
+++ b/collector/netframework_clrlocksandthreads_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRLocksAndThreadsCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRLocksAndThreadsCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRLocksAndThreadsCollector)
 }
diff --git a/collector/netframework_clrmemory.go b/collector/netframework_clrmemory.go
index 3d02ef21..580fa884 100644
--- a/collector/netframework_clrmemory.go
+++ b/collector/netframework_clrmemory.go
@@ -28,8 +28,8 @@ type NETFramework_NETCLRMemoryCollector struct {
 	PromotedMemoryfromGen1             *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRMemoryCollector ...
-func NewNETFramework_NETCLRMemoryCollector() (Collector, error) {
+// newNETFramework_NETCLRMemoryCollector ...
+func newNETFramework_NETCLRMemoryCollector() (Collector, error) {
 	const subsystem = "netframework_clrmemory"
 	return &NETFramework_NETCLRMemoryCollector{
 		AllocatedBytes: prometheus.NewDesc(
diff --git a/collector/netframework_clrmemory_test.go b/collector/netframework_clrmemory_test.go
index cc947a43..82f64ae3 100644
--- a/collector/netframework_clrmemory_test.go
+++ b/collector/netframework_clrmemory_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRMemoryCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRMemoryCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRMemoryCollector)
 }
diff --git a/collector/netframework_clrremoting.go b/collector/netframework_clrremoting.go
index 17a15bed..bd95cd07 100644
--- a/collector/netframework_clrremoting.go
+++ b/collector/netframework_clrremoting.go
@@ -19,8 +19,8 @@ type NETFramework_NETCLRRemotingCollector struct {
 	TotalRemoteCalls          *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRRemotingCollector ...
-func NewNETFramework_NETCLRRemotingCollector() (Collector, error) {
+// newNETFramework_NETCLRRemotingCollector ...
+func newNETFramework_NETCLRRemotingCollector() (Collector, error) {
 	const subsystem = "netframework_clrremoting"
 	return &NETFramework_NETCLRRemotingCollector{
 		Channels: prometheus.NewDesc(
diff --git a/collector/netframework_clrremoting_test.go b/collector/netframework_clrremoting_test.go
index 556d60ae..b07d2c82 100644
--- a/collector/netframework_clrremoting_test.go
+++ b/collector/netframework_clrremoting_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRRemotingCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRRemotingCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRRemotingCollector)
 }
diff --git a/collector/netframework_clrsecurity.go b/collector/netframework_clrsecurity.go
index e9c6b4fa..ddaa9f4d 100644
--- a/collector/netframework_clrsecurity.go
+++ b/collector/netframework_clrsecurity.go
@@ -17,8 +17,8 @@ type NETFramework_NETCLRSecurityCollector struct {
 	TotalRuntimeChecks   *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRSecurityCollector ...
-func NewNETFramework_NETCLRSecurityCollector() (Collector, error) {
+// newNETFramework_NETCLRSecurityCollector ...
+func newNETFramework_NETCLRSecurityCollector() (Collector, error) {
 	const subsystem = "netframework_clrsecurity"
 	return &NETFramework_NETCLRSecurityCollector{
 		NumberLinkTimeChecks: prometheus.NewDesc(
diff --git a/collector/netframework_clrsecurity_test.go b/collector/netframework_clrsecurity_test.go
index 93c4d416..b6286863 100644
--- a/collector/netframework_clrsecurity_test.go
+++ b/collector/netframework_clrsecurity_test.go
@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRSecurityCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRSecurityCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRSecurityCollector)
 }
diff --git a/collector/os.go b/collector/os.go
index bc4635e6..7ef57591 100644
--- a/collector/os.go
+++ b/collector/os.go
@@ -40,8 +40,8 @@ type pagingFileCounter struct {
 	UsagePeak float64 `perflib:"% Usage Peak"`
 }
 
-// NewOSCollector ...
-func NewOSCollector() (Collector, error) {
+// newOSCollector ...
+func newOSCollector() (Collector, error) {
 	const subsystem = "os"
 
 	return &OSCollector{
diff --git a/collector/os_test.go b/collector/os_test.go
index 5e98f42d..874fba2a 100644
--- a/collector/os_test.go
+++ b/collector/os_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkOSCollector(b *testing.B) {
-	benchmarkCollector(b, "os", NewOSCollector)
+	benchmarkCollector(b, "os", newOSCollector)
 }
diff --git a/collector/remote_fx.go b/collector/remote_fx.go
index 6b547fec..ac96a29e 100644
--- a/collector/remote_fx.go
+++ b/collector/remote_fx.go
@@ -38,8 +38,8 @@ type RemoteFxCollector struct {
 	SourceFramesPerSecond                       *prometheus.Desc
 }
 
-// NewRemoteFx ...
-func NewRemoteFx() (Collector, error) {
+// newRemoteFx ...
+func newRemoteFx() (Collector, error) {
 	const subsystem = "remote_fx"
 	return &RemoteFxCollector{
 		// net
diff --git a/collector/remote_fx_test.go b/collector/remote_fx_test.go
index 0fcc8625..6e921f06 100644
--- a/collector/remote_fx_test.go
+++ b/collector/remote_fx_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkRemoteFXCollector(b *testing.B) {
-	benchmarkCollector(b, "remote_fx", NewRemoteFx)
+	benchmarkCollector(b, "remote_fx", newRemoteFx)
 }
diff --git a/collector/scheduled_task.go b/collector/scheduled_task.go
index 8f320f8c..a26bac85 100644
--- a/collector/scheduled_task.go
+++ b/collector/scheduled_task.go
@@ -63,8 +63,8 @@ type ScheduledTask struct {
 
 type ScheduledTasks []ScheduledTask
 
-// NewScheduledTask ...
-func NewScheduledTask() (Collector, error) {
+// newScheduledTask ...
+func newScheduledTask() (Collector, error) {
 	const subsystem = "scheduled_task"
 
 	runtime.LockOSThread()
diff --git a/collector/scheduled_task_test.go b/collector/scheduled_task_test.go
index a294550a..5bf5bf8d 100644
--- a/collector/scheduled_task_test.go
+++ b/collector/scheduled_task_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkScheduledTaskCollector(b *testing.B) {
-	benchmarkCollector(b, "scheduled_task", NewScheduledTask)
+	benchmarkCollector(b, "scheduled_task", newScheduledTask)
 }
diff --git a/collector/service.go b/collector/service.go
index 73edd9cb..fc54bf9c 100644
--- a/collector/service.go
+++ b/collector/service.go
@@ -37,8 +37,8 @@ type serviceCollector struct {
 	queryWhereClause string
 }
 
-// NewserviceCollector ...
-func NewserviceCollector() (Collector, error) {
+// newserviceCollector ...
+func newserviceCollector() (Collector, error) {
 	const subsystem = "service"
 
 	if *serviceWhereClause == "" {
diff --git a/collector/service_test.go b/collector/service_test.go
index be2e7d4e..f2d5d57c 100644
--- a/collector/service_test.go
+++ b/collector/service_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkServiceCollector(b *testing.B) {
-	benchmarkCollector(b, "service", NewserviceCollector)
+	benchmarkCollector(b, "service", newserviceCollector)
 }
diff --git a/collector/smtp.go b/collector/smtp.go
index 0ff61e30..1dc5b5c8 100644
--- a/collector/smtp.go
+++ b/collector/smtp.go
@@ -64,7 +64,7 @@ type SMTPCollector struct {
 	serverBlacklistPattern *regexp.Regexp
 }
 
-func NewSMTPCollector() (Collector, error) {
+func newSMTPCollector() (Collector, error) {
 	log.Info("smtp collector is in an experimental state! Metrics for this collector have not been tested.")
 	const subsystem = "smtp"
 
diff --git a/collector/smtp_test.go b/collector/smtp_test.go
index 8b130576..0234c48e 100644
--- a/collector/smtp_test.go
+++ b/collector/smtp_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkSmtpCollector(b *testing.B) {
-	benchmarkCollector(b, "smtp", NewSMTPCollector)
+	benchmarkCollector(b, "smtp", newSMTPCollector)
 }
diff --git a/collector/system.go b/collector/system.go
index 937913be..f23f6598 100644
--- a/collector/system.go
+++ b/collector/system.go
@@ -18,8 +18,8 @@ type SystemCollector struct {
 	Threads                  *prometheus.Desc
 }
 
-// NewSystemCollector ...
-func NewSystemCollector() (Collector, error) {
+// newSystemCollector ...
+func newSystemCollector() (Collector, error) {
 	const subsystem = "system"
 
 	return &SystemCollector{
diff --git a/collector/system_test.go b/collector/system_test.go
index ee7ec9dd..3191bf2f 100644
--- a/collector/system_test.go
+++ b/collector/system_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkSystemCollector(b *testing.B) {
-	benchmarkCollector(b, "system", NewSystemCollector)
+	benchmarkCollector(b, "system", newSystemCollector)
 }
diff --git a/collector/tcp.go b/collector/tcp.go
index ae9e9d12..35113f30 100644
--- a/collector/tcp.go
+++ b/collector/tcp.go
@@ -21,8 +21,8 @@ type TCPCollector struct {
 	SegmentsSentTotal          *prometheus.Desc
 }
 
-// NewTCPCollector ...
-func NewTCPCollector() (Collector, error) {
+// newTCPCollector ...
+func newTCPCollector() (Collector, error) {
 	const subsystem = "tcp"
 
 	return &TCPCollector{
diff --git a/collector/tcp_test.go b/collector/tcp_test.go
index 92468df4..0d33c497 100644
--- a/collector/tcp_test.go
+++ b/collector/tcp_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkTCPCollector(b *testing.B) {
-	benchmarkCollector(b, "tcp", NewTCPCollector)
+	benchmarkCollector(b, "tcp", newTCPCollector)
 }
diff --git a/collector/terminal_services.go b/collector/terminal_services.go
index f25b6ea3..63fd97ff 100644
--- a/collector/terminal_services.go
+++ b/collector/terminal_services.go
@@ -61,8 +61,8 @@ type TerminalServicesCollector struct {
 	WorkingSetPeak              *prometheus.Desc
 }
 
-// NewTerminalServicesCollector ...
-func NewTerminalServicesCollector() (Collector, error) {
+// newTerminalServicesCollector ...
+func newTerminalServicesCollector() (Collector, error) {
 	const subsystem = "terminal_services"
 	return &TerminalServicesCollector{
 		LocalSessionCount: prometheus.NewDesc(
diff --git a/collector/terminal_services_test.go b/collector/terminal_services_test.go
index b443633c..5f0ad28c 100644
--- a/collector/terminal_services_test.go
+++ b/collector/terminal_services_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkTerminalServicesCollector(b *testing.B) {
-	benchmarkCollector(b, "terminal_services", NewTerminalServicesCollector)
+	benchmarkCollector(b, "terminal_services", newTerminalServicesCollector)
 }
diff --git a/collector/textfile.go b/collector/textfile.go
index 0f098220..75f78067 100644
--- a/collector/textfile.go
+++ b/collector/textfile.go
@@ -55,9 +55,9 @@ type textFileCollector struct {
 	mtime *float64
 }
 
-// NewTextFileCollector returns a new Collector exposing metrics read from files
+// newTextFileCollector returns a new Collector exposing metrics read from files
 // in the given textfile directory.
-func NewTextFileCollector() (Collector, error) {
+func newTextFileCollector() (Collector, error) {
 	return &textFileCollector{
 		path: *textFileDirectory,
 	}, nil
diff --git a/collector/thermalzone.go b/collector/thermalzone.go
index 78d3cb28..85daa739 100644
--- a/collector/thermalzone.go
+++ b/collector/thermalzone.go
@@ -15,8 +15,8 @@ type thermalZoneCollector struct {
 	ThrottleReasons     *prometheus.Desc
 }
 
-// NewThermalZoneCollector ...
-func NewThermalZoneCollector() (Collector, error) {
+// newThermalZoneCollector ...
+func newThermalZoneCollector() (Collector, error) {
 	const subsystem = "thermalzone"
 	return &thermalZoneCollector{
 		Temperature: prometheus.NewDesc(
diff --git a/collector/thermalzone_test.go b/collector/thermalzone_test.go
index d5d60b3e..1a6346bd 100644
--- a/collector/thermalzone_test.go
+++ b/collector/thermalzone_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkThermalZoneCollector(b *testing.B) {
-	benchmarkCollector(b, "thermalzone", NewThermalZoneCollector)
+	benchmarkCollector(b, "thermalzone", newThermalZoneCollector)
 }
diff --git a/collector/vmware.go b/collector/vmware.go
index bb7c6e1b..86b1948c 100644
--- a/collector/vmware.go
+++ b/collector/vmware.go
@@ -35,8 +35,8 @@ type VmwareCollector struct {
 	HostProcessorSpeedMHz *prometheus.Desc
 }
 
-// NewVmwareCollector constructs a new VmwareCollector
-func NewVmwareCollector() (Collector, error) {
+// newVmwareCollector constructs a new VmwareCollector
+func newVmwareCollector() (Collector, error) {
 	const subsystem = "vmware"
 	return &VmwareCollector{
 		MemActive: prometheus.NewDesc(
diff --git a/collector/vmware_test.go b/collector/vmware_test.go
index f135530a..d07d171c 100644
--- a/collector/vmware_test.go
+++ b/collector/vmware_test.go
@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkVmwareCollector(b *testing.B) {
-	benchmarkCollector(b, "vmware", NewVmwareCollector)
+	benchmarkCollector(b, "vmware", newVmwareCollector)
 }