diff --git a/src/pmdas/systemd/help b/src/pmdas/systemd/help
index 33746b0..122c751 100644
--- a/src/pmdas/systemd/help
+++ b/src/pmdas/systemd/help
@@ -31,17 +31,20 @@
 The number of attached clients.
 @ systemd.maxmem Maximum number of queued event bytes.
 Maximum number of queued event bytes (apprx. 128 bytes per cursor string).
-@ systemd.journal.cursor The cursor, an implicit journald field.
+
+@ systemd.parameters.cursor The cursor, an implicit journald field.
 This is the journal entry's permanent, globally unique cursor string.
-@ systemd.journal.string A journal field that may be a string.
+@ systemd.parameters.string A journal field that may be a string.
 A journal field copied verbatim, as a PM_TYPE_STRING object, presumed as
 a valid string (in some encoding), if the field did not contain any \0 characters.
-@ systemd.journal.blob A journal field copied verbatim.
+@ systemd.parameters.blob A journal field copied verbatim.
 A journal field copied verbatim, as a PM_TYPE_AGGREGATE object.
+
 @ systemd.journal.records Journal entries, encoded as strings and blobs.
-Each new journald event field is given a systemd.journal.cursor string to
-identify it, and a collection of string and blob fields (as appropriate).
+Each new journald event field is given a systemd.parameters.cursor string
+to identify it, and a collection of string and blob fields (as appropriate).
+
 @ systemd.journal.records_raw Journal entries, encoded as blob parameters only.
-Each new journald event field is given a systemd.journal.cursor string to
-identify it, and a blob fields the reproduce the FIELD=value bit-for-bit.
+Each new journald event field is given a systemd.parameters.cursor string
+to identify it, and a blob fields the reproduce the FIELD=value bit-for-bit.
 
diff --git a/src/pmdas/systemd/pmns b/src/pmdas/systemd/pmns
index 64eb74b..48cb4f7 100644
--- a/src/pmdas/systemd/pmns
+++ b/src/pmdas/systemd/pmns
@@ -17,15 +17,17 @@
 systemd {
     numclients		SYSTEMD:0:0
     maxmem		SYSTEMD:0:1
+    parameters
     journal
 }
 
-systemd.journal {
-    /* systemd.journal-fields */
+systemd.parameters {
     cursor              SYSTEMD:1:0
     string              SYSTEMD:1:1 /* pure ascii */
     blob                SYSTEMD:1:2 /* not pure ascii */
-    /* the records themselves */
+}
+
+systemd.journal {
     records             SYSTEMD:2:0
     records_raw         SYSTEMD:2:1
 }
diff --git a/src/pmdas/systemd/systemd.c b/src/pmdas/systemd/systemd.c
index 52232d3..a0bd1f0 100644
--- a/src/pmdas/systemd/systemd.c
+++ b/src/pmdas/systemd/systemd.c
@@ -62,17 +62,17 @@ static pmdaMetric metrictab[] = {
     { NULL,
       { PMDA_PMID(0,1), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_INSTANT,
         PMDA_PMUNITS(0,0,1,0,0,0) }, },
-/* journal.cursor */
+/* parameters.cursor */
 #define METRICTAB_JOURNAL_CURSOR_PMID metrictab[2].m_desc.pmid
     { NULL,
       { PMDA_PMID(1,0), PM_TYPE_STRING, PM_INDOM_NULL, PM_SEM_INSTANT,
         PMDA_PMUNITS(0,0,0,0,0,0) }, },
-/* journal.string */
+/* parameters.string */
 #define METRICTAB_JOURNAL_STRING_PMID metrictab[3].m_desc.pmid
     { NULL,
       { PMDA_PMID(1,1), PM_TYPE_STRING, PM_INDOM_NULL, PM_SEM_INSTANT,
         PMDA_PMUNITS(0,0,0,0,0,0) }, },
-/* journal.blob */
+/* parameters.blob */
 #define METRICTAB_JOURNAL_BLOB_PMID metrictab[4].m_desc.pmid
     { NULL,
       { PMDA_PMID(1,2), PM_TYPE_AGGREGATE, PM_INDOM_NULL, PM_SEM_INSTANT,