diff --git a/collector/collector.go b/collector/collector.go
index 97812d76..41708e3a 100644
--- a/collector/collector.go
+++ b/collector/collector.go
@@ -14,7 +14,7 @@ import (
 // ...
 const (
 	// TODO: Make package-local
-	Namespace = "wmi"
+	Namespace = "windows"
 
 	// Conversion factors
 	ticksToSecondsScaleFactor = 1 / 1e7
diff --git a/collector/mssql.go b/collector/mssql.go
index 25db71a5..ab980d8e 100644
--- a/collector/mssql.go
+++ b/collector/mssql.go
@@ -396,13 +396,13 @@ func NewMSSQLCollector() (Collector, error) {
 		// meta
 		mssqlScrapeDurationDesc: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "collector_duration_seconds"),
-			"wmi_exporter: Duration of an mssql child collection.",
+			"windows_exporter: Duration of an mssql child collection.",
 			[]string{"collector", "instance"},
 			nil,
 		),
 		mssqlScrapeSuccessDesc: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "collector_success"),
-			"wmi_exporter: Whether a mssql child collector was successful.",
+			"windows_exporter: Whether a mssql child collector was successful.",
 			[]string{"collector", "instance"},
 			nil,
 		),
diff --git a/collector/textfile.go b/collector/textfile.go
index bfd8c522..3caf9808 100644
--- a/collector/textfile.go
+++ b/collector/textfile.go
@@ -40,7 +40,7 @@ var (
 	).Default("C:\\Program Files\\wmi_exporter\\textfile_inputs").String()
 
 	mtimeDesc = prometheus.NewDesc(
-		"wmi_textfile_mtime_seconds",
+		prometheus.BuildFQName(Namespace, "textfile", "mtime_seconds"),
 		"Unixtime mtime of textfiles successfully read.",
 		[]string{"file"},
 		nil,
@@ -281,7 +281,7 @@ fileLoop:
 	// Export if there were errors.
 	ch <- prometheus.MustNewConstMetric(
 		prometheus.NewDesc(
-			"wmi_textfile_scrape_error",
+			prometheus.BuildFQName(Namespace, "textfile", "scrape_error"),
 			"1 if there was an error opening or reading a file, 0 otherwise",
 			nil, nil,
 		),
diff --git a/exporter.go b/exporter.go
index 42e8e636..8deed2fb 100644
--- a/exporter.go
+++ b/exporter.go
@@ -38,19 +38,19 @@ const (
 var (
 	scrapeDurationDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(collector.Namespace, "exporter", "collector_duration_seconds"),
-		"wmi_exporter: Duration of a collection.",
+		"windows_exporter: Duration of a collection.",
 		[]string{"collector"},
 		nil,
 	)
 	scrapeSuccessDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(collector.Namespace, "exporter", "collector_success"),
-		"wmi_exporter: Whether the collector was successful.",
+		"windows_exporter: Whether the collector was successful.",
 		[]string{"collector"},
 		nil,
 	)
 	scrapeTimeoutDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(collector.Namespace, "exporter", "collector_timeout"),
-		"wmi_exporter: Whether the collector timed out.",
+		"windows_exporter: Whether the collector timed out.",
 		[]string{"collector"},
 		nil,
 	)
@@ -452,7 +452,7 @@ func (mh *metricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	reg.MustRegister(
 		prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}),
 		prometheus.NewGoCollector(),
-		version.NewCollector("wmi_exporter"),
+		version.NewCollector("windows_exporter"),
 	)
 
 	h := promhttp.HandlerFor(reg, promhttp.HandlerOpts{})