diff --git a/opal/Makefile.am b/opal/Makefile.am
index 8f47f0bcbd..7a49910492 100644
--- a/opal/Makefile.am
+++ b/opal/Makefile.am
@@ -61,7 +61,7 @@ libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
-dist_ompidata_DATA =
+dist_opaldata_DATA =
 libopen_pal_la_SOURCES += $(headers)
 
 # Conditionally install the header files
diff --git a/opal/mca/base/Makefile.am b/opal/mca/base/Makefile.am
index dff3bade68..08bbcaca60 100644
--- a/opal/mca/base/Makefile.am
+++ b/opal/mca/base/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
 
 noinst_LTLIBRARIES = libmca_base.la
 
-dist_ompidata_DATA = help-mca-base.txt help-mca-var.txt
+dist_opaldata_DATA = help-mca-base.txt help-mca-var.txt
 
 # Source code files
 
diff --git a/opal/mca/crs/blcr/Makefile.am b/opal/mca/crs/blcr/Makefile.am
index c80e64c8af..78fa768c01 100644
--- a/opal/mca/crs/blcr/Makefile.am
+++ b/opal/mca/crs/blcr/Makefile.am
@@ -18,7 +18,7 @@
 CFLAGS = $(crs_blcr_CFLAGS)
 AM_CPPFLAGS = $(crs_blcr_CPPFLAGS)
 
-dist_ompidata_DATA = help-opal-crs-blcr.txt
+dist_opaldata_DATA = help-opal-crs-blcr.txt
 
 sources = \
         crs_blcr.h \
diff --git a/opal/mca/crs/none/Makefile.am b/opal/mca/crs/none/Makefile.am
index 3ae729e3bb..48bbc9067c 100644
--- a/opal/mca/crs/none/Makefile.am
+++ b/opal/mca/crs/none/Makefile.am
@@ -14,7 +14,7 @@
 AM_CPPFLAGS = \
     $(LTDLINCL)
 
-dist_ompidata_DATA = help-opal-crs-none.txt
+dist_opaldata_DATA = help-opal-crs-none.txt
 
 sources = \
         crs_none.h \
diff --git a/opal/mca/crs/self/Makefile.am b/opal/mca/crs/self/Makefile.am
index 8dbcebcef7..15ae3b9e22 100644
--- a/opal/mca/crs/self/Makefile.am
+++ b/opal/mca/crs/self/Makefile.am
@@ -18,7 +18,7 @@
 AM_CPPFLAGS = \
     $(LTDLINCL)
 
-dist_ompidata_DATA = help-opal-crs-self.txt
+dist_opaldata_DATA = help-opal-crs-self.txt
 
 sources = \
         crs_self.h \
diff --git a/opal/mca/dstore/Makefile.am b/opal/mca/dstore/Makefile.am
index db90b1f4b8..c9a8017615 100644
--- a/opal/mca/dstore/Makefile.am
+++ b/opal/mca/dstore/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libmca_dstore.la
 libmca_dstore_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_opaldata_DATA =
 
 # local files
 headers = dstore.h dstore_types.h
diff --git a/opal/mca/dstore/base/Makefile.am b/opal/mca/dstore/base/Makefile.am
index c461e054c4..0eba3ce4a7 100644
--- a/opal/mca/dstore/base/Makefile.am
+++ b/opal/mca/dstore/base/Makefile.am
@@ -9,7 +9,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA += base/help-dstore-base.txt
+dist_opaldata_DATA += base/help-dstore-base.txt
 
 headers += \
 	base/base.h
diff --git a/opal/mca/hwloc/base/Makefile.am b/opal/mca/hwloc/base/Makefile.am
index 74cb2ec917..877bfe8c89 100644
--- a/opal/mca/hwloc/base/Makefile.am
+++ b/opal/mca/hwloc/base/Makefile.am
@@ -7,7 +7,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = base/help-opal-hwloc-base.txt
+dist_opaldata_DATA = base/help-opal-hwloc-base.txt
 
 headers += \
         base/base.h
diff --git a/opal/mca/hwloc/hwloc172/hwloc/Makefile.am b/opal/mca/hwloc/hwloc172/hwloc/Makefile.am
index 659299b6fd..d3fcb2f374 100644
--- a/opal/mca/hwloc/hwloc172/hwloc/Makefile.am
+++ b/opal/mca/hwloc/hwloc172/hwloc/Makefile.am
@@ -29,7 +29,7 @@ endif
 
 # Only install the valgrind suppressions file if we're building in standalone mode
 if HWLOC_BUILD_STANDALONE
-dist_ompidata_DATA = contrib/hwloc-valgrind.supp
+dist_opaldata_DATA = contrib/hwloc-valgrind.supp
 endif
 
 #
diff --git a/opal/mca/memory/linux/Makefile.am b/opal/mca/memory/linux/Makefile.am
index da69070961..152932a63a 100644
--- a/opal/mca/memory/linux/Makefile.am
+++ b/opal/mca/memory/linux/Makefile.am
@@ -36,7 +36,7 @@ docdir      = $(opaldatadir)/doc
 doc_DATA    = COPYRIGHT-ptmalloc2.txt
 
 # Help file
-dist_ompidata_DATA = help-opal-memory-linux.txt
+dist_opaldata_DATA = help-opal-memory-linux.txt
 
 # This component is only ever built statically (i.e., slurped into
 # libopen-pal) -- it is never built as a DSO.
diff --git a/opal/mca/sec/Makefile.am b/opal/mca/sec/Makefile.am
index febbb6ce4f..8edc9527e7 100644
--- a/opal/mca/sec/Makefile.am
+++ b/opal/mca/sec/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libmca_sec.la
 libmca_sec_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_opaldata_DATA =
 
 # local files
 headers = sec.h
diff --git a/opal/mca/shmem/mmap/Makefile.am b/opal/mca/shmem/mmap/Makefile.am
index 9514dffb67..1d859433f5 100644
--- a/opal/mca/shmem/mmap/Makefile.am
+++ b/opal/mca/shmem/mmap/Makefile.am
@@ -37,7 +37,7 @@ component_install =
 endif
 
 # help file
-dist_ompidata_DATA = help-opal-shmem-mmap.txt
+dist_opaldata_DATA = help-opal-shmem-mmap.txt
 
 mcacomponentdir = $(opallibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
diff --git a/opal/mca/shmem/posix/Makefile.am b/opal/mca/shmem/posix/Makefile.am
index b39286c382..a955684539 100644
--- a/opal/mca/shmem/posix/Makefile.am
+++ b/opal/mca/shmem/posix/Makefile.am
@@ -47,4 +47,4 @@ libmca_shmem_posix_la_SOURCES = $(sources)
 libmca_shmem_posix_la_LDFLAGS = -module -avoid-version
 
 # help file
-dist_ompidata_DATA = help-opal-shmem-posix.txt
+dist_opaldata_DATA = help-opal-shmem-posix.txt
diff --git a/opal/mca/shmem/sysv/Makefile.am b/opal/mca/shmem/sysv/Makefile.am
index d219439eb8..418ab98d45 100644
--- a/opal/mca/shmem/sysv/Makefile.am
+++ b/opal/mca/shmem/sysv/Makefile.am
@@ -45,4 +45,4 @@ libmca_shmem_sysv_la_SOURCES = $(sources)
 libmca_shmem_sysv_la_LDFLAGS = -module -avoid-version
 
 # help file
-dist_ompidata_DATA = help-opal-shmem-sysv.txt
+dist_opaldata_DATA = help-opal-shmem-sysv.txt
diff --git a/opal/runtime/Makefile.am b/opal/runtime/Makefile.am
index 4da98ac6e4..dff2f30438 100644
--- a/opal/runtime/Makefile.am
+++ b/opal/runtime/Makefile.am
@@ -25,7 +25,7 @@ AM_CFLAGS = \
             -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\""
 
 # Source code files
-dist_ompidata_DATA += runtime/help-opal-runtime.txt \
+dist_opaldata_DATA += runtime/help-opal-runtime.txt \
                      runtime/help-opal_info.txt
 
 headers += \
diff --git a/opal/tools/opal-checkpoint/Makefile.am b/opal/tools/opal-checkpoint/Makefile.am
index a0c91aeee2..3bbdb587e5 100644
--- a/opal/tools/opal-checkpoint/Makefile.am
+++ b/opal/tools/opal-checkpoint/Makefile.am
@@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-opal-checkpoint.txt
+dist_opaldata_DATA = help-opal-checkpoint.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/opal/tools/opal-restart/Makefile.am b/opal/tools/opal-restart/Makefile.am
index d03bb6b39a..5322fdc9ea 100644
--- a/opal/tools/opal-restart/Makefile.am
+++ b/opal/tools/opal-restart/Makefile.am
@@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-opal-restart.txt
+dist_opaldata_DATA = help-opal-restart.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am
index 9d75ffccef..3befabcf8f 100644
--- a/opal/tools/wrappers/Makefile.am
+++ b/opal/tools/wrappers/Makefile.am
@@ -32,12 +32,12 @@ bin_PROGRAMS = opal_wrapper
 
 nodist_man_MANS = opal_wrapper.1
 
-dist_ompidata_DATA = help-opal-wrapper.txt
+dist_opaldata_DATA = help-opal-wrapper.txt
 
 # Only install the following for developer-level installs
 if WANT_INSTALL_HEADERS
 
-nodist_ompidata_DATA = \
+nodist_opaldata_DATA = \
 	opalcc-wrapper-data.txt \
 	opalc++-wrapper-data.txt
 
diff --git a/opal/util/Makefile.am b/opal/util/Makefile.am
index c7e0722777..649d157109 100644
--- a/opal/util/Makefile.am
+++ b/opal/util/Makefile.am
@@ -21,7 +21,7 @@
 
 SUBDIRS = keyval
 
-dist_ompidata_DATA = help-opal-util.txt
+dist_opaldata_DATA = help-opal-util.txt
 
 AM_LFLAGS = -Popal_show_help_yy
 LEX_OUTPUT_ROOT = lex.opal_show_help_yy
diff --git a/orte/Makefile.am b/orte/Makefile.am
index b87e68e7dd..1f4e4aebd6 100644
--- a/orte/Makefile.am
+++ b/orte/Makefile.am
@@ -44,7 +44,7 @@ libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)
 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 libopen_rte_la_SOURCES += $(headers)
 
 # Conditionally install the header files
diff --git a/orte/mca/errmgr/Makefile.am b/orte/mca/errmgr/Makefile.am
index 8d23da1ab6..c13982069e 100644
--- a/orte/mca/errmgr/Makefile.am
+++ b/orte/mca/errmgr/Makefile.am
@@ -26,7 +26,7 @@ headers = errmgr.h
 libmca_errmgr_la_SOURCES += $(headers)
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/orte/mca/errmgr/base/Makefile.am b/orte/mca/errmgr/base/Makefile.am
index 146f384628..0ace6905bd 100644
--- a/orte/mca/errmgr/base/Makefile.am
+++ b/orte/mca/errmgr/base/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA += base/help-errmgr-base.txt
+dist_ortedata_DATA += base/help-errmgr-base.txt
 
 headers += \
         base/errmgr_private.h \
diff --git a/orte/mca/ess/Makefile.am b/orte/mca/ess/Makefile.am
index 28e22bf261..11d6405127 100644
--- a/orte/mca/ess/Makefile.am
+++ b/orte/mca/ess/Makefile.am
@@ -24,7 +24,7 @@ noinst_LTLIBRARIES = libmca_ess.la
 libmca_ess_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # local files
 headers = ess.h
diff --git a/orte/mca/ess/base/Makefile.am b/orte/mca/ess/base/Makefile.am
index d4be3c5aa3..438a1afb05 100644
--- a/orte/mca/ess/base/Makefile.am
+++ b/orte/mca/ess/base/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA += base/help-ess-base.txt
+dist_ortedata_DATA += base/help-ess-base.txt
 
 headers += \
         base/base.h
diff --git a/orte/mca/filem/base/Makefile.am b/orte/mca/filem/base/Makefile.am
index b7adedc8b4..091adbc5b0 100644
--- a/orte/mca/filem/base/Makefile.am
+++ b/orte/mca/filem/base/Makefile.am
@@ -25,4 +25,4 @@ libmca_filem_la_SOURCES += \
         base/filem_base_receive.c \
         base/filem_base_fns.c
 
-dist_ompidata_DATA = base/help-orte-filem-base.txt
+dist_ortedata_DATA = base/help-orte-filem-base.txt
diff --git a/orte/mca/filem/raw/Makefile.am b/orte/mca/filem/raw/Makefile.am
index 5772d792e5..2e154c5908 100644
--- a/orte/mca/filem/raw/Makefile.am
+++ b/orte/mca/filem/raw/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-filem-raw.txt
+dist_ortedata_DATA = help-orte-filem-raw.txt
 
 sources = \
         filem_raw.h \
diff --git a/orte/mca/odls/Makefile.am b/orte/mca/odls/Makefile.am
index 0d721560fe..2a6376b44a 100644
--- a/orte/mca/odls/Makefile.am
+++ b/orte/mca/odls/Makefile.am
@@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_odls.la
 libmca_odls_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # local files
 headers = odls.h odls_types.h
diff --git a/orte/mca/odls/base/Makefile.am b/orte/mca/odls/base/Makefile.am
index 4bfdbb758d..726b417e65 100644
--- a/orte/mca/odls/base/Makefile.am
+++ b/orte/mca/odls/base/Makefile.am
@@ -27,4 +27,4 @@ libmca_odls_la_SOURCES += \
         base/odls_base_select.c \
         base/odls_base_default_fns.c
 
-dist_ompidata_DATA += base/help-orte-odls-base.txt
+dist_ortedata_DATA += base/help-orte-odls-base.txt
diff --git a/orte/mca/odls/default/Makefile.am b/orte/mca/odls/default/Makefile.am
index 6773304bbe..b2248eb102 100644
--- a/orte/mca/odls/default/Makefile.am
+++ b/orte/mca/odls/default/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-odls-default.txt
+dist_ortedata_DATA = help-orte-odls-default.txt
 
 sources = \
         odls_default.h \
diff --git a/orte/mca/oob/Makefile.am b/orte/mca/oob/Makefile.am
index c75dbb64e4..d1a4fc3f92 100644
--- a/orte/mca/oob/Makefile.am
+++ b/orte/mca/oob/Makefile.am
@@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_oob.la
 libmca_oob_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # local files
 headers = oob.h
diff --git a/orte/mca/oob/base/Makefile.am b/orte/mca/oob/base/Makefile.am
index d0144e4b0f..5b34cfb9ad 100644
--- a/orte/mca/oob/base/Makefile.am
+++ b/orte/mca/oob/base/Makefile.am
@@ -19,7 +19,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA += base/help-oob-base.txt
+dist_ortedata_DATA += base/help-oob-base.txt
 
 headers += \
 	base/base.h
diff --git a/orte/mca/oob/tcp/Makefile.am b/orte/mca/oob/tcp/Makefile.am
index a6fac9e07c..73d983b2be 100644
--- a/orte/mca/oob/tcp/Makefile.am
+++ b/orte/mca/oob/tcp/Makefile.am
@@ -20,7 +20,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-oob-tcp.txt
+dist_ortedata_DATA = help-oob-tcp.txt
 
 sources = \
           oob_tcp_component.h \
diff --git a/orte/mca/oob/ud/Makefile.am b/orte/mca/oob/ud/Makefile.am
index 09c2f96134..29526793f9 100644
--- a/orte/mca/oob/ud/Makefile.am
+++ b/orte/mca/oob/ud/Makefile.am
@@ -19,7 +19,7 @@
 
 AM_CPPFLAGS = $(orte_oob_ud_CPPFLAGS)
 
-dist_ompidata_DATA = help-oob-ud.txt
+dist_ortedata_DATA = help-oob-ud.txt
 
 sources = \
 	oob_ud_component.c \
diff --git a/orte/mca/plm/Makefile.am b/orte/mca/plm/Makefile.am
index d16b6fed06..da9498c799 100644
--- a/orte/mca/plm/Makefile.am
+++ b/orte/mca/plm/Makefile.am
@@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_plm.la
 libmca_plm_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # local files
 headers = plm.h plm_types.h
diff --git a/orte/mca/plm/alps/Makefile.am b/orte/mca/plm/alps/Makefile.am
index 7e0765a128..9c400373ae 100644
--- a/orte/mca/plm/alps/Makefile.am
+++ b/orte/mca/plm/alps/Makefile.am
@@ -22,7 +22,7 @@ sources = \
         plm_alps_component.c \
         plm_alps_module.c
 
-dist_ompidata_DATA = help-plm-alps.txt
+dist_ortedata_DATA = help-plm-alps.txt
 
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
diff --git a/orte/mca/plm/base/Makefile.am b/orte/mca/plm/base/Makefile.am
index 02b3f4a4df..5077f1e87b 100644
--- a/orte/mca/plm/base/Makefile.am
+++ b/orte/mca/plm/base/Makefile.am
@@ -30,4 +30,4 @@ libmca_plm_la_SOURCES += \
 	base/plm_base_proxy.c \
 	base/plm_base_orted_cmds.c
 
-dist_ompidata_DATA += base/help-plm-base.txt
+dist_ortedata_DATA += base/help-plm-base.txt
diff --git a/orte/mca/plm/lsf/Makefile.am b/orte/mca/plm/lsf/Makefile.am
index 60d4bb5103..06a351e7ec 100644
--- a/orte/mca/plm/lsf/Makefile.am
+++ b/orte/mca/plm/lsf/Makefile.am
@@ -21,7 +21,7 @@
 
 AM_CPPFLAGS = $(plm_lsf_CPPFLAGS)
 
-dist_ompidata_DATA = help-plm-lsf.txt
+dist_ortedata_DATA = help-plm-lsf.txt
 
 sources = \
         plm_lsf.h \
diff --git a/orte/mca/plm/rsh/Makefile.am b/orte/mca/plm/rsh/Makefile.am
index 2d3c136d2e..f2571896f3 100644
--- a/orte/mca/plm/rsh/Makefile.am
+++ b/orte/mca/plm/rsh/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-plm-rsh.txt
+dist_ortedata_DATA = help-plm-rsh.txt
 
 sources = \
         plm_rsh.h \
diff --git a/orte/mca/plm/slurm/Makefile.am b/orte/mca/plm/slurm/Makefile.am
index 79ec7fc523..72c3ff7b32 100644
--- a/orte/mca/plm/slurm/Makefile.am
+++ b/orte/mca/plm/slurm/Makefile.am
@@ -22,7 +22,7 @@ sources = \
         plm_slurm_component.c \
         plm_slurm_module.c
 
-dist_ompidata_DATA = help-plm-slurm.txt
+dist_ortedata_DATA = help-plm-slurm.txt
 
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
diff --git a/orte/mca/plm/tm/Makefile.am b/orte/mca/plm/tm/Makefile.am
index 772b4b5e20..6cda9aa46c 100644
--- a/orte/mca/plm/tm/Makefile.am
+++ b/orte/mca/plm/tm/Makefile.am
@@ -19,7 +19,7 @@
 
 AM_CPPFLAGS = $(plm_tm_CPPFLAGS)
 
-dist_ompidata_DATA = help-plm-tm.txt
+dist_ortedata_DATA = help-plm-tm.txt
 
 sources = \
         plm_tm.h \
diff --git a/orte/mca/ras/Makefile.am b/orte/mca/ras/Makefile.am
index 9c65774752..1085c7d383 100644
--- a/orte/mca/ras/Makefile.am
+++ b/orte/mca/ras/Makefile.am
@@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libmca_ras.la
 libmca_ras_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # local files
 headers = ras.h ras_types.h
diff --git a/orte/mca/ras/alps/Makefile.am b/orte/mca/ras/alps/Makefile.am
index 7a1f91c600..f006878db4 100644
--- a/orte/mca/ras/alps/Makefile.am
+++ b/orte/mca/ras/alps/Makefile.am
@@ -20,7 +20,7 @@
 
 AM_CPPFLAGS = $(ras_alps_CPPFLAGS)
 
-dist_ompidata_DATA = help-ras-alps.txt \
+dist_ortedata_DATA = help-ras-alps.txt \
 		  ras-alps-command.sh
 
 install-data-hook:
diff --git a/orte/mca/ras/base/Makefile.am b/orte/mca/ras/base/Makefile.am
index ef0440b21b..5d8f657d93 100644
--- a/orte/mca/ras/base/Makefile.am
+++ b/orte/mca/ras/base/Makefile.am
@@ -16,7 +16,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA += base/help-ras-base.txt
+dist_ortedata_DATA += base/help-ras-base.txt
 
 headers += \
         base/base.h \
diff --git a/orte/mca/ras/gridengine/Makefile.am b/orte/mca/ras/gridengine/Makefile.am
index 3efde48d9b..1149cb8925 100644
--- a/orte/mca/ras/gridengine/Makefile.am
+++ b/orte/mca/ras/gridengine/Makefile.am
@@ -19,7 +19,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-ras-gridengine.txt
+dist_ortedata_DATA = help-ras-gridengine.txt
 
 sources = \
         ras_gridengine.h \
diff --git a/orte/mca/ras/lsf/Makefile.am b/orte/mca/ras/lsf/Makefile.am
index e8addb6072..2172708bb6 100644
--- a/orte/mca/ras/lsf/Makefile.am
+++ b/orte/mca/ras/lsf/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-ras-lsf.txt
+dist_ortedata_DATA = help-ras-lsf.txt
 
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
diff --git a/orte/mca/ras/simulator/Makefile.am b/orte/mca/ras/simulator/Makefile.am
index a2d6e2ac57..6ee170ed4c 100644
--- a/orte/mca/ras/simulator/Makefile.am
+++ b/orte/mca/ras/simulator/Makefile.am
@@ -7,7 +7,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-ras-simulator.txt
+dist_ortedata_DATA = help-ras-simulator.txt
 
 sources = \
         ras_sim.h \
diff --git a/orte/mca/ras/slurm/Makefile.am b/orte/mca/ras/slurm/Makefile.am
index 874a78366c..9327061cd7 100644
--- a/orte/mca/ras/slurm/Makefile.am
+++ b/orte/mca/ras/slurm/Makefile.am
@@ -19,7 +19,7 @@
 
 AM_CPPFLAGS = $(ras_slurm_CPPFLAGS)
 
-dist_ompidata_DATA = help-ras-slurm.txt
+dist_ortedata_DATA = help-ras-slurm.txt
 
 sources = \
         ras_slurm.h \
diff --git a/orte/mca/ras/tm/Makefile.am b/orte/mca/ras/tm/Makefile.am
index 01ffcef3ca..bd423b1465 100644
--- a/orte/mca/ras/tm/Makefile.am
+++ b/orte/mca/ras/tm/Makefile.am
@@ -19,7 +19,7 @@
 
 # Use the top-level Makefile.options
 
-dist_ompidata_DATA = help-ras-tm.txt
+dist_ortedata_DATA = help-ras-tm.txt
 
 
 AM_CPPFLAGS = $(ras_tm_CPPFLAGS)
diff --git a/orte/mca/rmaps/base/Makefile.am b/orte/mca/rmaps/base/Makefile.am
index 33da470041..46b0a177dd 100644
--- a/orte/mca/rmaps/base/Makefile.am
+++ b/orte/mca/rmaps/base/Makefile.am
@@ -31,7 +31,7 @@ libmca_rmaps_la_SOURCES += \
         base/rmaps_base_ranking.c \
         base/rmaps_base_print_fns.c
 
-dist_ompidata_DATA = base/help-orte-rmaps-base.txt
+dist_ortedata_DATA = base/help-orte-rmaps-base.txt
 
 if OPAL_HAVE_HWLOC
 libmca_rmaps_la_SOURCES += \
diff --git a/orte/mca/rmaps/lama/Makefile.am b/orte/mca/rmaps/lama/Makefile.am
index 25279ff9a4..fabcb55e3f 100644
--- a/orte/mca/rmaps/lama/Makefile.am
+++ b/orte/mca/rmaps/lama/Makefile.am
@@ -9,7 +9,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-rmaps-lama.txt
+dist_ortedata_DATA = help-orte-rmaps-lama.txt
 
 sources = \
         rmaps_lama_module.c \
diff --git a/orte/mca/rmaps/mindist/Makefile.am b/orte/mca/rmaps/mindist/Makefile.am
index 5e00a82e36..8c5f0f68e4 100644
--- a/orte/mca/rmaps/mindist/Makefile.am
+++ b/orte/mca/rmaps/mindist/Makefile.am
@@ -18,7 +18,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-rmaps-md.txt
+dist_ortedata_DATA = help-orte-rmaps-md.txt
 
 sources = \
         rmaps_mindist.h \
diff --git a/orte/mca/rmaps/ppr/Makefile.am b/orte/mca/rmaps/ppr/Makefile.am
index 781ee34a86..b9ecaceb65 100644
--- a/orte/mca/rmaps/ppr/Makefile.am
+++ b/orte/mca/rmaps/ppr/Makefile.am
@@ -7,7 +7,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-rmaps-ppr.txt
+dist_ortedata_DATA = help-orte-rmaps-ppr.txt
 
 sources = \
         rmaps_ppr.c \
diff --git a/orte/mca/rmaps/rank_file/Makefile.am b/orte/mca/rmaps/rank_file/Makefile.am
index 19895077db..7febf96f43 100644
--- a/orte/mca/rmaps/rank_file/Makefile.am
+++ b/orte/mca/rmaps/rank_file/Makefile.am
@@ -21,7 +21,7 @@
 
 AM_LFLAGS = -Porte_rmaps_rank_file_
 LEX_OUTPUT_ROOT = lex.orte_rmaps_rank_file_
-dist_ompidata_DATA = help-rmaps_rank_file.txt
+dist_ortedata_DATA = help-rmaps_rank_file.txt
 
 sources = \
         rmaps_rank_file.c \
diff --git a/orte/mca/rmaps/resilient/Makefile.am b/orte/mca/rmaps/resilient/Makefile.am
index d1e1fee907..bbd758747a 100644
--- a/orte/mca/rmaps/resilient/Makefile.am
+++ b/orte/mca/rmaps/resilient/Makefile.am
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-rmaps-resilient.txt
+dist_ortedata_DATA = help-orte-rmaps-resilient.txt
 
 sources = \
         rmaps_resilient.c \
diff --git a/orte/mca/rmaps/round_robin/Makefile.am b/orte/mca/rmaps/round_robin/Makefile.am
index 783aed2378..6b7ea2383b 100644
--- a/orte/mca/rmaps/round_robin/Makefile.am
+++ b/orte/mca/rmaps/round_robin/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-rmaps-rr.txt
+dist_ortedata_DATA = help-orte-rmaps-rr.txt
 
 sources = \
         rmaps_rr.c \
diff --git a/orte/mca/rmaps/seq/Makefile.am b/orte/mca/rmaps/seq/Makefile.am
index 697bcfeefb..8aeda45de6 100644
--- a/orte/mca/rmaps/seq/Makefile.am
+++ b/orte/mca/rmaps/seq/Makefile.am
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-rmaps-seq.txt
+dist_ortedata_DATA = help-orte-rmaps-seq.txt
 
 sources = \
         rmaps_seq.c \
diff --git a/orte/mca/rtc/base/Makefile.am b/orte/mca/rtc/base/Makefile.am
index 083a58088e..6f897f5305 100644
--- a/orte/mca/rtc/base/Makefile.am
+++ b/orte/mca/rtc/base/Makefile.am
@@ -15,4 +15,4 @@ libmca_rtc_la_SOURCES += \
         base/rtc_base_select.c \
         base/rtc_base_stubs.c
 
-dist_ompidata_DATA = base/help-orte-rtc-base.txt
+dist_ortedata_DATA = base/help-orte-rtc-base.txt
diff --git a/orte/mca/snapc/base/Makefile.am b/orte/mca/snapc/base/Makefile.am
index d664f69af1..66a90862bd 100644
--- a/orte/mca/snapc/base/Makefile.am
+++ b/orte/mca/snapc/base/Makefile.am
@@ -25,4 +25,4 @@ libmca_snapc_la_SOURCES += \
         base/snapc_base_select.c \
 	base/snapc_base_fns.c
 
-dist_ompidata_DATA = base/help-orte-snapc-base.txt
+dist_ortedata_DATA = base/help-orte-snapc-base.txt
diff --git a/orte/mca/snapc/full/Makefile.am b/orte/mca/snapc/full/Makefile.am
index f08d462ced..5ab0af2357 100644
--- a/orte/mca/snapc/full/Makefile.am
+++ b/orte/mca/snapc/full/Makefile.am
@@ -15,7 +15,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-snapc-full.txt
+dist_ortedata_DATA = help-orte-snapc-full.txt
 
 sources = \
         snapc_full.h \
diff --git a/orte/mca/sstore/base/Makefile.am b/orte/mca/sstore/base/Makefile.am
index c86231311c..97f743f278 100644
--- a/orte/mca/sstore/base/Makefile.am
+++ b/orte/mca/sstore/base/Makefile.am
@@ -17,4 +17,4 @@ libmca_sstore_la_SOURCES += \
         base/sstore_base_select.c \
         base/sstore_base_fns.c
 
-dist_ompidata_DATA = base/help-orte-sstore-base.txt
+dist_ortedata_DATA = base/help-orte-sstore-base.txt
diff --git a/orte/mca/sstore/central/Makefile.am b/orte/mca/sstore/central/Makefile.am
index b924f837ce..b62259334c 100644
--- a/orte/mca/sstore/central/Makefile.am
+++ b/orte/mca/sstore/central/Makefile.am
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-sstore-central.txt
+dist_ortedata_DATA = help-orte-sstore-central.txt
 
 sources = \
         sstore_central.h \
diff --git a/orte/mca/sstore/stage/Makefile.am b/orte/mca/sstore/stage/Makefile.am
index 16b69d575f..9ce36f53e6 100644
--- a/orte/mca/sstore/stage/Makefile.am
+++ b/orte/mca/sstore/stage/Makefile.am
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-orte-sstore-stage.txt
+dist_ortedata_DATA = help-orte-sstore-stage.txt
 
 sources = \
         sstore_stage.h \
diff --git a/orte/mca/state/Makefile.am b/orte/mca/state/Makefile.am
index e065225e6c..6a42ea50f9 100644
--- a/orte/mca/state/Makefile.am
+++ b/orte/mca/state/Makefile.am
@@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libmca_state.la
 libmca_state_la_SOURCES =
 
 # pkgdata setup
-dist_ompidata_DATA =
+dist_ortedata_DATA =
 
 # local files
 headers = state.h state_types.h
diff --git a/orte/mca/state/staged_hnp/Makefile.am b/orte/mca/state/staged_hnp/Makefile.am
index 254e0d0f20..697560f272 100644
--- a/orte/mca/state/staged_hnp/Makefile.am
+++ b/orte/mca/state/staged_hnp/Makefile.am
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-state-staged-hnp.txt
+dist_ortedata_DATA = help-state-staged-hnp.txt
 
 sources = \
         state_staged_hnp.h \
diff --git a/orte/orted/Makefile.am b/orte/orted/Makefile.am
index 69a78a7b34..b57ab8d479 100644
--- a/orte/orted/Makefile.am
+++ b/orte/orted/Makefile.am
@@ -19,7 +19,7 @@
 
 # This makefile.am does not stand on its own - it is included from orte/Makefile.am
 
-dist_ompidata_DATA += orted/help-orted.txt
+dist_ortedata_DATA += orted/help-orted.txt
 
 headers += \
 	orted/orted.h
diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am
index 855381a560..e772f62758 100644
--- a/orte/runtime/Makefile.am
+++ b/orte/runtime/Makefile.am
@@ -22,7 +22,7 @@
 
 # This makefile.am does not stand on its own - it is included from orte/Makefile.am
 
-dist_ompidata_DATA += runtime/help-orte-runtime.txt
+dist_ortedata_DATA += runtime/help-orte-runtime.txt
 
 headers += \
         runtime/runtime.h \
diff --git a/orte/tools/orte-checkpoint/Makefile.am b/orte/tools/orte-checkpoint/Makefile.am
index 908ce9b24b..0c487c8608 100644
--- a/orte/tools/orte-checkpoint/Makefile.am
+++ b/orte/tools/orte-checkpoint/Makefile.am
@@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orte-checkpoint.txt
+dist_ortedata_DATA = help-orte-checkpoint.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am
index 9c2f6244f7..f15f4be8db 100644
--- a/orte/tools/orte-clean/Makefile.am
+++ b/orte/tools/orte-clean/Makefile.am
@@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orte-clean.txt
+dist_ortedata_DATA = help-orte-clean.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/orte-info/Makefile.am b/orte/tools/orte-info/Makefile.am
index 3de7bf38eb..e58a7b73c3 100644
--- a/orte/tools/orte-info/Makefile.am
+++ b/orte/tools/orte-info/Makefile.am
@@ -45,7 +45,7 @@ if OPAL_INSTALL_BINARIES
 
 bin_PROGRAMS = orte-info
 
-dist_ompidata_DATA = help-orte-info.txt
+dist_ortedata_DATA = help-orte-info.txt
 
 nodist_man_MANS = $(man_pages)
 
diff --git a/orte/tools/orte-migrate/Makefile.am b/orte/tools/orte-migrate/Makefile.am
index 968d4f1b2f..d23552c2fe 100644
--- a/orte/tools/orte-migrate/Makefile.am
+++ b/orte/tools/orte-migrate/Makefile.am
@@ -29,7 +29,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orte-migrate.txt
+dist_ortedata_DATA = help-orte-migrate.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am
index 46245bb610..777db5ca1f 100644
--- a/orte/tools/orte-ps/Makefile.am
+++ b/orte/tools/orte-ps/Makefile.am
@@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orte-ps.txt
+dist_ortedata_DATA = help-orte-ps.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/orte-restart/Makefile.am b/orte/tools/orte-restart/Makefile.am
index 94b13d81b3..7cbc8f59dc 100644
--- a/orte/tools/orte-restart/Makefile.am
+++ b/orte/tools/orte-restart/Makefile.am
@@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orte-restart.txt
+dist_ortedata_DATA = help-orte-restart.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/orte-server/Makefile.am b/orte/tools/orte-server/Makefile.am
index 8997811ebd..45b22d39ad 100644
--- a/orte/tools/orte-server/Makefile.am
+++ b/orte/tools/orte-server/Makefile.am
@@ -27,7 +27,7 @@ if OPAL_INSTALL_BINARIES
 
 bin_PROGRAMS = orte-server
 
-dist_ompidata_DATA = help-orte-server.txt
+dist_ortedata_DATA = help-orte-server.txt
 
 nodist_man_MANS = $(man_pages)
 
diff --git a/orte/tools/orte-top/Makefile.am b/orte/tools/orte-top/Makefile.am
index 3cb06b34d2..7b344c9122 100644
--- a/orte/tools/orte-top/Makefile.am
+++ b/orte/tools/orte-top/Makefile.am
@@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orte-top.txt
+dist_ortedata_DATA = help-orte-top.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am
index 4321c20f56..9386a81359 100644
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@@ -43,7 +43,7 @@ nodist_man_MANS = $(man_pages)
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_ompidata_DATA = help-orterun.txt
+dist_ortedata_DATA = help-orterun.txt
 
 endif # OPAL_INSTALL_BINARIES
 
diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am
index 65ff907801..08646ab4d5 100644
--- a/orte/tools/wrappers/Makefile.am
+++ b/orte/tools/wrappers/Makefile.am
@@ -21,7 +21,7 @@
 if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
 if OPAL_INSTALL_BINARIES
 
-nodist_ompidata_DATA = ortecc-wrapper-data.txt
+nodist_ortedata_DATA = ortecc-wrapper-data.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = orte.pc
diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am
index 760aacd315..7c0f931058 100644
--- a/orte/util/Makefile.am
+++ b/orte/util/Makefile.am
@@ -22,7 +22,7 @@
 
 include $(top_srcdir)/Makefile.ompi-rules
 
-dist_ompidata_DATA += util/hostfile/help-hostfile.txt \
+dist_ortedata_DATA += util/hostfile/help-hostfile.txt \
                      util/dash_host/help-dash-host.txt \
                      util/help-regex.txt
 
diff --git a/oshmem/Makefile.am b/oshmem/Makefile.am
index 9661a458e2..f7033798b9 100644
--- a/oshmem/Makefile.am
+++ b/oshmem/Makefile.am
@@ -74,7 +74,7 @@ liboshmem_la_LDFLAGS = \
 headers =
 noinst_LTLIBRARIES =
 include_HEADERS =
-dist_ompidata_DATA =
+dist_oshmemdata_DATA =
 liboshmem_la_SOURCES += $(headers)
 nodist_man_MANS =
 
diff --git a/oshmem/mca/memheap/Makefile.am b/oshmem/mca/memheap/Makefile.am
index fb985dffa8..339e029b9c 100644
--- a/oshmem/mca/memheap/Makefile.am
+++ b/oshmem/mca/memheap/Makefile.am
@@ -14,7 +14,7 @@ libmca_memheap_la_SOURCES =
 libmca_memheap_la_LDFLAGS =
 libmca_memheap_la_LIBADD =
 
-dist_ompidata_DATA = 
+dist_oshmemdata_DATA = 
 
 # local files
 headers = memheap.h
diff --git a/oshmem/mca/memheap/base/Makefile.am b/oshmem/mca/memheap/base/Makefile.am
index 464300f63d..4d9162449d 100644
--- a/oshmem/mca/memheap/base/Makefile.am
+++ b/oshmem/mca/memheap/base/Makefile.am
@@ -7,7 +7,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA += base/help-shmem-mca.txt 
+dist_oshmemdata_DATA += base/help-shmem-mca.txt 
 
 headers += \
         base/base.h 
diff --git a/oshmem/mca/spml/ikrit/Makefile.am b/oshmem/mca/spml/ikrit/Makefile.am
index fbf8406f69..b87bdecf08 100644
--- a/oshmem/mca/spml/ikrit/Makefile.am
+++ b/oshmem/mca/spml/ikrit/Makefile.am
@@ -9,7 +9,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = \
+dist_oshmemdata_DATA = \
 	help-shmem-spml-ikrit.txt
 
 AM_CPPFLAGS = $(spml_ikrit_CPPFLAGS)
diff --git a/oshmem/mca/spml/yoda/Makefile.am b/oshmem/mca/spml/yoda/Makefile.am
index 5003faa010..5ac94c527b 100644
--- a/oshmem/mca/spml/yoda/Makefile.am
+++ b/oshmem/mca/spml/yoda/Makefile.am
@@ -9,7 +9,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = \
+dist_oshmemdata_DATA = \
 	help-shmem-spml-yoda.txt
 
 EXTRA_DIST = post_configure.sh
diff --git a/oshmem/mca/sshmem/base/Makefile.am b/oshmem/mca/sshmem/base/Makefile.am
index 3b0dc81ea2..9b2af1f4e1 100644
--- a/oshmem/mca/sshmem/base/Makefile.am
+++ b/oshmem/mca/sshmem/base/Makefile.am
@@ -7,7 +7,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = base/help-oshmem-sshmem.txt
+dist_oshmemdata_DATA = base/help-oshmem-sshmem.txt
 
 headers += \
         base/base.h
diff --git a/oshmem/mca/sshmem/mmap/Makefile.am b/oshmem/mca/sshmem/mmap/Makefile.am
index c26d373140..2927d2c86a 100644
--- a/oshmem/mca/sshmem/mmap/Makefile.am
+++ b/oshmem/mca/sshmem/mmap/Makefile.am
@@ -7,7 +7,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-oshmem-sshmem-mmap.txt
+dist_oshmemdata_DATA = help-oshmem-sshmem-mmap.txt
 
 sources = \
         sshmem_mmap.h \
diff --git a/oshmem/mca/sshmem/sysv/Makefile.am b/oshmem/mca/sshmem/sysv/Makefile.am
index 09441007e1..8229f5339a 100644
--- a/oshmem/mca/sshmem/sysv/Makefile.am
+++ b/oshmem/mca/sshmem/sysv/Makefile.am
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-dist_ompidata_DATA = help-oshmem-sshmem-sysv.txt
+dist_oshmemdata_DATA = help-oshmem-sshmem-sysv.txt
 
 sources = \
         sshmem_sysv.h \
diff --git a/oshmem/runtime/Makefile.am b/oshmem/runtime/Makefile.am
index 350bcffe25..0173068312 100644
--- a/oshmem/runtime/Makefile.am
+++ b/oshmem/runtime/Makefile.am
@@ -9,7 +9,7 @@
 
 # This makefile.am does not stand on its own - it is included from oshmem/Makefile.am
 
-dist_ompidata_DATA += runtime/help-shmem-runtime.txt
+dist_oshmemdata_DATA += runtime/help-shmem-runtime.txt
 
 
 headers += \
diff --git a/oshmem/shmem/Makefile.am b/oshmem/shmem/Makefile.am
index 03812dc063..961a0c0a60 100644
--- a/oshmem/shmem/Makefile.am
+++ b/oshmem/shmem/Makefile.am
@@ -9,4 +9,4 @@
 
 headers += shmem/shmem_api_logger.h \
            shmem/shmem_lock.h
-dist_ompidata_DATA += shmem/c/help-shmem-api.txt
+dist_oshmemdata_DATA += shmem/c/help-shmem-api.txt
diff --git a/oshmem/tools/wrappers/Makefile.am b/oshmem/tools/wrappers/Makefile.am
index 7e8e5d7bdf..e47669cd63 100644
--- a/oshmem/tools/wrappers/Makefile.am
+++ b/oshmem/tools/wrappers/Makefile.am
@@ -8,7 +8,7 @@
 #
 # $HEADER$
 
-dist_ompidata_DATA =  \
+dist_oshmemdata_DATA =  \
 	shmemcc-wrapper-data.txt \
 	shmemfort-wrapper-data.txt