diff --git a/cmd/mongo.go b/cmd/mongo.go
index cbc93a4..2efd6ad 100644
--- a/cmd/mongo.go
+++ b/cmd/mongo.go
@@ -14,21 +14,21 @@ import (
 func mongoMonitoredClientOptions(l *zap.Logger) *mongoOpt.ClientOptions {
 	promMongoHeartbeat := promauto.NewHistogramVec(prom.HistogramOpts{
 		Subsystem: "mongo",
-		Name:      "heartbeat",
+		Name:      "heartbeat_time",
 		Help:      "Time in ns for succeeded heartbeat, or 0 on failure",
 		Buckets:   []float64{1},
 	}, []string{"connection_id"})
 
 	promMongoCmd := promauto.NewHistogramVec(prom.HistogramOpts{
 		Subsystem: "mongo",
-		Name:      "command",
+		Name:      "command_time",
 		Help:      "Time in ns of commands",
 		Buckets:   prom.DefBuckets,
 	}, []string{"connection_id", "command_name"})
 
 	promMongoCmdErr := promauto.NewCounterVec(prom.CounterOpts{
 		Subsystem: "mongo",
-		Name:      "errors_count",
+		Name:      "errors",
 		Help:      "Count of failed commands",
 	}, []string{"connection_id", "command_name"})
 
diff --git a/cmd/mower.go b/cmd/mower.go
index 64ec911..d5d2b87 100644
--- a/cmd/mower.go
+++ b/cmd/mower.go
@@ -85,12 +85,12 @@ var App = &cli.App{
 
 			promErrWatching = promauto.NewCounter(prom.CounterOpts{
 				Subsystem: "watcher",
-				Name:      "errors_count",
+				Name:      "errors",
 				Help:      "Error in logmower watching log files",
 			})
 			promFilesRead = promauto.NewCounter(prom.CounterOpts{
 				Subsystem: "watcher",
-				Name:      "file_count",
+				Name:      "seen_files",
 				Help:      "Number of tracked log files",
 			})
 		)
diff --git a/cmd/sender.go b/cmd/sender.go
index bd2715f..b9cce95 100644
--- a/cmd/sender.go
+++ b/cmd/sender.go
@@ -15,27 +15,27 @@ import (
 var (
 	promShipperMongoSent = promauto.NewCounterVec(prom.CounterOpts{
 		Subsystem: "shipper",
-		Name:      "sent_count",
+		Name:      "sent",
 		Help:      "Items successfully committed to mongo",
 	}, []string{"filename"})
 	promShipperMongoSentError = promauto.NewCounterVec(prom.CounterOpts{
 		Subsystem: "shipper",
-		Name:      "mongo_errors_count",
+		Name:      "mongo_errors",
 		Help:      "Errors while submitting to mongo", // TODO:
 	}, []string{"filename"})
 	promShipperDropped = promauto.NewCounterVec(prom.CounterOpts{
 		Subsystem: "shipper",
-		Name:      "queue_dropped_count",
+		Name:      "queue_dropped",
 		Help:      "Items ready to be batched and sent to mongo, but dropped due to full queue",
 	}, []string{"filename"})
 	promLineParsingErr = promauto.NewCounterVec(prom.CounterOpts{
 		Subsystem: "shipper",
-		Name:      "lines_parsing_err_count",
+		Name:      "lines_parsing_errors",
 		Help:      "Errors while parsing log line suffixes",
 	}, []string{"filename"})
 	promShipperQueueItems = promauto.NewHistogramVec(prom.HistogramOpts{
 		Subsystem: "shipper",
-		Name:      "queue_items",
+		Name:      "queued",
 		Help:      "Items in queue to be batched and sent to mongo",
 	}, []string{"filename"})
 	promShipperSynced = promauto.NewGaugeVec(prom.GaugeOpts{