diff --git a/CHANGELOG.md b/CHANGELOG.md
index b446f170a..e291a58f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - **breaking change** Plugin measurements aggregated into a single measurement.
 - `procstat` cpu measurements are now prepended with `cpu_time_` instead of
 only `cpu_`
+- The prometheus plugin schema has not been changed (measurements have not been
+aggregated).
 
 ### Features
 - Plugin measurements aggregated into a single measurement.
diff --git a/plugins/prometheus/prometheus.go b/plugins/prometheus/prometheus.go
index cb824e3f2..7775b97b6 100644
--- a/plugins/prometheus/prometheus.go
+++ b/plugins/prometheus/prometheus.go
@@ -80,14 +80,14 @@ func (g *Prometheus) gatherURL(url string, acc plugins.Accumulator) error {
 			return fmt.Errorf("error getting processing samples for %s: %s", url, err)
 		}
 		for _, sample := range samples {
-			tags := map[string]string{}
+			tags := make(map[string]string)
 			for key, value := range sample.Metric {
 				if key == model.MetricNameLabel {
 					continue
 				}
 				tags[string(key)] = string(value)
 			}
-			acc.Add(string(sample.Metric[model.MetricNameLabel]),
+			acc.Add("prometheus_"+string(sample.Metric[model.MetricNameLabel]),
 				float64(sample.Value), tags)
 		}
 	}
diff --git a/plugins/puppetagent/puppetagent.go b/plugins/puppetagent/puppetagent.go
index 67b01dce3..8939e5963 100644
--- a/plugins/puppetagent/puppetagent.go
+++ b/plugins/puppetagent/puppetagent.go
@@ -104,15 +104,16 @@ func (pa *PuppetAgent) Gather(acc plugins.Accumulator) error {
 		return fmt.Errorf("%s", err)
 	}
 
-	structPrinter(&puppetState, acc)
+	tags := map[string]string{"location": pa.Location}
+	structPrinter(&puppetState, acc, tags)
 
 	return nil
 }
 
-func structPrinter(s *State, acc plugins.Accumulator) {
-
+func structPrinter(s *State, acc plugins.Accumulator, tags map[string]string) {
 	e := reflect.ValueOf(s).Elem()
 
+	fields := make(map[string]interface{})
 	for tLevelFNum := 0; tLevelFNum < e.NumField(); tLevelFNum++ {
 		name := e.Type().Field(tLevelFNum).Name
 		nameNumField := e.FieldByName(name).NumField()
@@ -123,10 +124,10 @@ func structPrinter(s *State, acc plugins.Accumulator) {
 
 			lname := strings.ToLower(name)
 			lsName := strings.ToLower(sName)
-			acc.Add(fmt.Sprintf("%s_%s", lname, lsName), sValue, nil)
+			fields[fmt.Sprintf("%s_%s", lname, lsName)] = sValue
 		}
 	}
-
+	acc.AddFields("puppetagent", fields, tags)
 }
 
 func init() {