diff --git a/smtpd/handler.go b/smtpd/handler.go
index e2a5768..8f09ad4 100644
--- a/smtpd/handler.go
+++ b/smtpd/handler.go
@@ -340,11 +340,11 @@ func (ss *Session) dataHandler() {
 				for _, m := range messages {
 					if m != nil {
 						m.Close()
-						expDeliveredTotal.Add(1)
+						expReceivedTotal.Add(1)
 					}
 				}
 			} else {
-				expDeliveredTotal.Add(1)
+				expReceivedTotal.Add(1)
 			}
 			ss.send("250 Mail accepted for delivery")
 			ss.info("Message size %v bytes", msgSize)
diff --git a/smtpd/listener.go b/smtpd/listener.go
index 2dd58b2..bb78afb 100644
--- a/smtpd/listener.go
+++ b/smtpd/listener.go
@@ -25,7 +25,7 @@ type Server struct {
 // Raw stat collectors
 var expConnectsTotal = new(expvar.Int)
 var expConnectsCurrent = new(expvar.Int)
-var expDeliveredTotal = new(expvar.Int)
+var expReceivedTotal = new(expvar.Int)
 var expErrorsTotal = new(expvar.Int)
 var expWarnsTotal = new(expvar.Int)
 
@@ -36,7 +36,7 @@ var errorsHist = list.New()
 var warnsHist = list.New()
 
 // History rendered as comma delim string
-var expDeliveredHist = new(expvar.String)
+var expReceivedHist = new(expvar.String)
 var expConnectsHist = new(expvar.String)
 var expErrorsHist = new(expvar.String)
 var expWarnsHist = new(expvar.String)
@@ -96,7 +96,7 @@ func metricsTicker(t *time.Ticker) {
 	ok := true
 	for ok {
 		_, ok = <-t.C
-		expDeliveredHist.Set(pushMetric(deliveredHist, expDeliveredTotal))
+		expReceivedHist.Set(pushMetric(deliveredHist, expReceivedTotal))
 		expConnectsHist.Set(pushMetric(connectsHist, expConnectsTotal))
 		expErrorsHist.Set(pushMetric(errorsHist, expErrorsTotal))
 		expWarnsHist.Set(pushMetric(warnsHist, expWarnsTotal))
@@ -120,8 +120,8 @@ func init() {
 	m.Set("ConnectsTotal", expConnectsTotal)
 	m.Set("ConnectsHist", expConnectsHist)
 	m.Set("ConnectsCurrent", expConnectsCurrent)
-	m.Set("DeliveredTotal", expDeliveredTotal)
-	m.Set("DeliveredHist", expDeliveredHist)
+	m.Set("ReceivedTotal", expReceivedTotal)
+	m.Set("ReceivedHist", expReceivedHist)
 	m.Set("ErrorsTotal", expErrorsTotal)
 	m.Set("ErrorsHist", expErrorsHist)
 	m.Set("WarnsTotal", expWarnsTotal)
diff --git a/themes/integral/templates/root/status.html b/themes/integral/templates/root/status.html
index 9a33b78..d9b43cf 100644
--- a/themes/integral/templates/root/status.html
+++ b/themes/integral/templates/root/status.html
@@ -100,8 +100,8 @@
     metric('smtpConnectsCurrent', data.smtp.ConnectsCurrent, numberFilter, true)
 
     // Server-side history
-    metric('smtpDeliveredTotal', data.smtp.DeliveredTotal, numberFilter, false)
-    setHistory('smtpDeliveredTotal', data.smtp.DeliveredHist)
+    metric('smtpReceivedTotal', data.smtp.ReceivedTotal, numberFilter, false)
+    setHistory('smtpReceivedTotal', data.smtp.ReceivedHist)
     metric('smtpConnectsTotal', data.smtp.ConnectsTotal, numberFilter, false)
     setHistory('smtpConnectsTotal', data.smtp.ConnectsHist)
     metric('smtpWarnsTotal', data.smtp.WarnsTotal, numberFilter, false)
@@ -189,9 +189,9 @@
       <td>(60min)</td>
     </tr>
     <tr>
-      <th>Messages Delivered:</th>
-      <td><span id="m-smtpDeliveredTotal">.</span></td>
-      <td class="sparkline"><span id="s-smtpDeliveredTotal">.</span></td>
+      <th>Messages Received:</th>
+      <td><span id="m-smtpReceivedTotal">.</span></td>
+      <td class="sparkline"><span id="s-smtpReceivedTotal">.</span></td>
       <td>(60min)</td>
     </tr>
     <tr>