diff --git a/src/mca/Makefile.am b/src/mca/Makefile.am
index 3e01d1b508..afed47069b 100644
--- a/src/mca/Makefile.am
+++ b/src/mca/Makefile.am
@@ -14,8 +14,7 @@ SUBDIRS = \
         pcm \
         pml \
         ptl \
-        registry \
-        topo
+        registry
 
 # Source code files
 
@@ -36,8 +35,7 @@ libmca_la_LIBADD = $(LIBLTDL_LTLIB) \
         pcm/libmca_pcm.la \
         pml/libmca_pml.la \
         ptl/libmca_ptl.la \
-        registry/libmca_registry.la \
-        topo/libmca_topo.la
+        registry/libmca_registry.la
 libmca_la_DEPENDENCIES = $(libmca_la_LIBADD)
 
 # Conditionally install the header files
diff --git a/src/mca/coll/basic/Makefile.am b/src/mca/coll/basic/Makefile.am
index 6736119bba..cb30dc90ea 100644
--- a/src/mca/coll/basic/Makefile.am
+++ b/src/mca/coll/basic/Makefile.am
@@ -19,7 +19,7 @@ if LAM_BUILD_coll_basic_LOADABLE_MODULE
 module_noinst =
 module_install = mca_coll_basic.la
 else
-module_noinst = libmca_mpi_coll_basic.la
+module_noinst = libmca_coll_basic.la
 module_install =
 endif
 
@@ -32,6 +32,6 @@ mca_coll_basic_la_LIBADD = \
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_mpi_coll_basic_la_SOURCES =
-libmca_mpi_coll_basic_la_LIBADD = src/libmca_coll_basic.la
-libmca_mpi_coll_basic_la_LDFLAGS = -module -avoid-version
+libmca_coll_basic_la_SOURCES =
+libmca_coll_basic_la_LIBADD = src/libmca_coll_basic.la
+libmca_coll_basic_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/oob/cofs/Makefile.am b/src/mca/oob/cofs/Makefile.am
index c47730d503..37720c2d5e 100644
--- a/src/mca/oob/cofs/Makefile.am
+++ b/src/mca/oob/cofs/Makefile.am
@@ -19,7 +19,7 @@ if LAM_BUILD_oob_cofs_LOADABLE_MODULE
 module_noinst = 
 module_install = mca_oob_cofs.la
 else
-module_noinst = libmca_lam_oob_cofs.la
+module_noinst = libmca_oob_cofs.la
 module_install =
 endif
 
@@ -32,6 +32,6 @@ mca_oob_cofs_la_LIBADD = \
 mca_oob_cofs_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_lam_oob_cofs_la_SOURCES =
-libmca_lam_oob_cofs_la_LIBADD = src/libmca_oob_cofs.la
-libmca_lam_oob_cofs_la_LDFLAGS = -module -avoid-version
+libmca_oob_cofs_la_SOURCES =
+libmca_oob_cofs_la_LIBADD = src/libmca_oob_cofs.la
+libmca_oob_cofs_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/pcm/cofs/Makefile.am b/src/mca/pcm/cofs/Makefile.am
index ffe3682ae1..a6e323c997 100644
--- a/src/mca/pcm/cofs/Makefile.am
+++ b/src/mca/pcm/cofs/Makefile.am
@@ -19,7 +19,7 @@ if LAM_BUILD_pcm_cofs_LOADABLE_MODULE
 module_noinst =
 module_install = mca_pcm_cofs.la
 else
-module_noinst = libmca_lam_pcm_cofs.la
+module_noinst = libmca_pcm_cofs.la
 module_install =
 endif
 
@@ -32,6 +32,6 @@ mca_pcm_cofs_la_LIBADD = \
 mca_pcm_cofs_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_lam_pcm_cofs_la_SOURCES =
-libmca_lam_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la
-libmca_lam_pcm_cofs_la_LDFLAGS = -module -avoid-version
+libmca_pcm_cofs_la_SOURCES =
+libmca_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la
+libmca_pcm_cofs_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/pml/teg/Makefile.am b/src/mca/pml/teg/Makefile.am
index 7b7951eb64..65174100d9 100644
--- a/src/mca/pml/teg/Makefile.am
+++ b/src/mca/pml/teg/Makefile.am
@@ -18,7 +18,7 @@ if LAM_BUILD_pml_teg_LOADABLE_MODULE
 module_noinst =
 module_install = mca_pml_teg.la
 else
-module_noinst = libmca_mpi_pml_teg.la
+module_noinst = libmca_pml_teg.la
 module_install =
 endif
 
@@ -31,6 +31,6 @@ mca_pml_teg_la_LIBADD = \
 mca_pml_teg_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_mpi_pml_teg_la_SOURCES =
-libmca_mpi_pml_teg_la_LIBADD = src/libmca_pml_teg.la
-libmca_mpi_pml_teg_la_LDFLAGS = -module -avoid-version
+libmca_pml_teg_la_SOURCES =
+libmca_pml_teg_la_LIBADD = src/libmca_pml_teg.la
+libmca_pml_teg_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/ptl/tcp/Makefile.am b/src/mca/ptl/tcp/Makefile.am
index 59cf2efcf3..742050d785 100644
--- a/src/mca/ptl/tcp/Makefile.am
+++ b/src/mca/ptl/tcp/Makefile.am
@@ -18,7 +18,7 @@ if LAM_BUILD_ptl_tcp_LOADABLE_MODULE
 module_noinst =
 module_install = mca_ptl_tcp.la
 else
-module_noinst = libmca_mpi_ptl_tcp.la
+module_noinst = libmca_ptl_tcp.la
 module_install =
 endif
 
@@ -31,6 +31,6 @@ mca_ptl_tcp_la_LIBADD = \
 mca_ptl_tcp_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_mpi_ptl_tcp_la_SOURCES =
-libmca_mpi_ptl_tcp_la_LIBADD = src/libmca_ptl_tcp.la
-libmca_mpi_ptl_tcp_la_LDFLAGS = -module -avoid-version
+libmca_ptl_tcp_la_SOURCES =
+libmca_ptl_tcp_la_LIBADD = src/libmca_ptl_tcp.la
+libmca_ptl_tcp_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/registry/cofs/Makefile.am b/src/mca/registry/cofs/Makefile.am
index 5cb9461fe9..9e1d0d5ad1 100644
--- a/src/mca/registry/cofs/Makefile.am
+++ b/src/mca/registry/cofs/Makefile.am
@@ -19,7 +19,7 @@ if LAM_BUILD_registry_cofs_LOADABLE_MODULE
 module_noinst =
 module_install = mca_registry_cofs.la
 else
-module_noinst = libmca_lam_registry_cofs.la
+module_noinst = libmca_registry_cofs.la
 module_install =
 endif
 
@@ -32,6 +32,6 @@ mca_registry_cofs_la_LIBADD = \
 mca_registry_cofs_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_lam_registry_cofs_la_SOURCES =
-libmca_lam_registry_cofs_la_LIBADD = src/libmca_registry_cofs.la
-libmca_lam_registry_cofs_la_LDFLAGS = -module -avoid-version
+libmca_registry_cofs_la_SOURCES =
+libmca_registry_cofs_la_LIBADD = src/libmca_registry_cofs.la
+libmca_registry_cofs_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/topo/unity/Makefile.am b/src/mca/topo/unity/Makefile.am
index 6c18dd7aad..a19af7d950 100644
--- a/src/mca/topo/unity/Makefile.am
+++ b/src/mca/topo/unity/Makefile.am
@@ -20,7 +20,7 @@ if LAM_BUILD_LOADABLE_MODULE
 module_noinst =
 module_install = mca_topo_unity.la
 else
-module_noinst = libmca_mpi_topo_unity.la
+module_noinst = libmca_topo_unity.la
 module_install =
 endif
 
@@ -33,7 +33,7 @@ mca_topo_unity_la_LIBADD = \
 mca_topo_unity_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(module_noinst)
-libmca_mpi_topo_unity_la_SOURCES =
-libmca_mpi_topo_unity_la_LIBADD = src/libmca_topo_unity.la
-libmca_mpi_topo_unity_la_LDFLAGS = -module -avoid-version
+libmca_topo_unity_la_SOURCES =
+libmca_topo_unity_la_LIBADD = src/libmca_topo_unity.la
+libmca_topo_unity_la_LDFLAGS = -module -avoid-version