diff --git a/configure.ac b/configure.ac
index 6965be1e74858d2ec7c409d3fa61f90f4fc6ac03..cafcebc4aa56252b82196e94a080600875c14881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_CONFIG_FILES([Makefile
 		 src/plugins/jobcomp/script/Makefile
 		 src/plugins/proctrack/Makefile
 		 src/plugins/proctrack/aix/Makefile
-		 src/plugins/proctrack/sid/Makefile
+		 src/plugins/proctrack/pgid/Makefile
 		 src/plugins/proctrack/linuxproc/Makefile
 		 src/plugins/sched/Makefile
 		 src/plugins/sched/backfill/Makefile
diff --git a/src/common/read_config.h b/src/common/read_config.h
index 09c85dcd013989a047af90de96e6ea34eee84579..1d73dd04019423082e3e31c3bec8e4e3fcb4c22a 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -53,7 +53,7 @@
 #  define DEFAULT_PROCTRACK_TYPE    "proctrack/aix"
 #else
 #  define DEFAULT_CHECKPOINT_TYPE   "checkpoint/none"
-#  define DEFAULT_PROCTRACK_TYPE    "proctrack/sid"
+#  define DEFAULT_PROCTRACK_TYPE    "proctrack/pgid"
 #endif
 #define DEFAULT_RETURN_TO_SERVICE   0
 #define DEFAULT_SAVE_STATE_LOC      "/tmp"
diff --git a/src/plugins/proctrack/Makefile.am b/src/plugins/proctrack/Makefile.am
index 3ec084f9bb4bca780ab5f17f1f09b68568da52a2..8945c1faf94fd91b159cafef176a4be837d6f0cc 100644
--- a/src/plugins/proctrack/Makefile.am
+++ b/src/plugins/proctrack/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile for proctrack plugins
 
 if HAVE_AIX_PROCTRACK
-SUBDIRS = aix sid linuxproc
+SUBDIRS = aix pgid linuxproc
 else
-SUBDIRS = sid linuxproc
+SUBDIRS = pgid linuxproc
 endif
diff --git a/src/plugins/proctrack/pgid/Makefile.am b/src/plugins/proctrack/pgid/Makefile.am
index d1b655aa05ab07cc49f81885d68a7596193f69ba..edb814ed03e2fb5a68caab2c6d6f79fdd655c1a3 100644
--- a/src/plugins/proctrack/pgid/Makefile.am
+++ b/src/plugins/proctrack/pgid/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile for proctrack/sid plugin
+# Makefile for proctrack/pgid plugin
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -7,8 +7,8 @@ PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 
-pkglib_LTLIBRARIES = proctrack_sid.la
+pkglib_LTLIBRARIES = proctrack_pgid.la
 
 # Process group ID process tracking  plugin.
-proctrack_sid_la_SOURCES = proctrack_sid.c
-proctrack_sid_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+proctrack_pgid_la_SOURCES = proctrack_pgid.c
+proctrack_pgid_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/proctrack/pgid/proctrack_sid.c b/src/plugins/proctrack/pgid/proctrack_pgid.c
similarity index 97%
rename from src/plugins/proctrack/pgid/proctrack_sid.c
rename to src/plugins/proctrack/pgid/proctrack_pgid.c
index 19c8ff7bc91500de15330017dacc040f8ba24300..bab31b769d5c47f5801ba400bdd1eb4cf70f0851 100644
--- a/src/plugins/proctrack/pgid/proctrack_sid.c
+++ b/src/plugins/proctrack/pgid/proctrack_pgid.c
@@ -1,5 +1,5 @@
 /*****************************************************************************\
- *  proctrack_sid.c - process tracking via process group ID plugin.
+ *  proctrack_pgid.c - process tracking via process group ID plugin.
  *****************************************************************************
  *  Copyright (C) 2005 The Regents of the University of California.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -74,7 +74,7 @@
  * matures.
  */
 const char plugin_name[]      = "Process tracking via process group ID plugin";
-const char plugin_type[]      = "proctrack/sid";
+const char plugin_type[]      = "proctrack/pgid";
 const uint32_t plugin_version = 90;
 
 /*