diff --git a/prometheus-client.cabal b/prometheus-client.cabal
--- a/prometheus-client.cabal
+++ b/prometheus-client.cabal
@@ -1,5 +1,5 @@
 name:                prometheus-client
-version:             0.2.0
+version:             0.3.0
 synopsis:            Haskell client library for http://prometheus.io.
 description:         Haskell client library for http://prometheus.io.
 homepage:            https://github.com/fimad/prometheus-haskell
diff --git a/src/Prometheus/Metric/Histogram.hs b/src/Prometheus/Metric/Histogram.hs
--- a/src/Prometheus/Metric/Histogram.hs
+++ b/src/Prometheus/Metric/Histogram.hs
@@ -94,12 +94,12 @@
     BucketCounts total count counts <- STM.readTVar bucketCounts
     let sumSample = Sample (name ++ "_sum") [] (bsShow total)
     let countSample = Sample (name ++ "_count") [] (bsShow count)
-    let infSample = Sample name [(bucketLabel, "+Inf")] (bsShow count)
+    let infSample = Sample (name ++ "_bucket") [(bucketLabel, "+Inf")] (bsShow count)
     let samples = map toSample (cumulativeSum (Map.toAscList counts))
     return [SampleGroup info HistogramType $ samples ++ [infSample, sumSample, countSample]]
     where
         toSample (upperBound, count') =
-            Sample name [(bucketLabel, formatFloat upperBound)] $ bsShow count'
+            Sample (name ++ "_bucket") [(bucketLabel, formatFloat upperBound)] $ bsShow count'
         name = metricName info
 
         -- We don't particularly want scientific notation, so force regular