diff --git a/LICENSE b/LICENSE
index 39dc6c1c70..d42f3b0d21 100644
--- a/LICENSE
+++ b/LICENSE
@@ -14,7 +14,7 @@ Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
                         University of Stuttgart.  All rights reserved.
 Copyright (c) 2004-2006 The Regents of the University of California.
                         All rights reserved.
-Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
                         reserved. 
 Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
 Copyright (c) 2006      Voltaire, Inc. All rights reserved.
diff --git a/ompi/mca/allocator/basic/configure.params b/ompi/mca/allocator/basic/configure.params
index 43a211dade..3513f8d956 100644
--- a/ompi/mca/allocator/basic/configure.params
+++ b/ompi/mca/allocator/basic/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=allocator_basic_alloc.c
-PARAM_CONFIG_HEADER_FILE="allocator_basic_alloc.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/allocator/bucket/configure.params b/ompi/mca/allocator/bucket/configure.params
index 8120a68213..3513f8d956 100644
--- a/ompi/mca/allocator/bucket/configure.params
+++ b/ompi/mca/allocator/bucket/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=allocator_bucket_alloc.c
-PARAM_CONFIG_HEADER_FILE="allocator_bucket_alloc.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/bml/r2/configure.params b/ompi/mca/bml/r2/configure.params
index b6136da859..3513f8d956 100644
--- a/ompi/mca/bml/r2/configure.params
+++ b/ompi/mca/bml/r2/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=bml_ob1.c
-PARAM_CONFIG_HEADER_FILE="ob1_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/gm/configure.params b/ompi/mca/btl/gm/configure.params
index 8a1df9624e..3513f8d956 100644
--- a/ompi/mca/btl/gm/configure.params
+++ b/ompi/mca/btl/gm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_gm.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/mvapi/configure.params b/ompi/mca/btl/mvapi/configure.params
index 895b8c0451..3513f8d956 100644
--- a/ompi/mca/btl/mvapi/configure.params
+++ b/ompi/mca/btl/mvapi/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_mvapi.c
-PARAM_CONFIG_HEADER_FILE="mvapi_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/mx/configure.params b/ompi/mca/btl/mx/configure.params
index f99781c3e4..3513f8d956 100644
--- a/ompi/mca/btl/mx/configure.params
+++ b/ompi/mca/btl/mx/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_mx.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/openib/configure.params b/ompi/mca/btl/openib/configure.params
index db5ff2136c..3513f8d956 100644
--- a/ompi/mca/btl/openib/configure.params
+++ b/ompi/mca/btl/openib/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_openib.c
-PARAM_CONFIG_HEADER_FILE="openib_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/portals/configure.params b/ompi/mca/btl/portals/configure.params
index 6a9eb2fba6..3513f8d956 100644
--- a/ompi/mca/btl/portals/configure.params
+++ b/ompi/mca/btl/portals/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=src/btl_portals.h
-PARAM_CONFIG_HEADER_FILE="src/portals_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/self/configure.params b/ompi/mca/btl/self/configure.params
index 059baf9d0c..3513f8d956 100644
--- a/ompi/mca/btl/self/configure.params
+++ b/ompi/mca/btl/self/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_self.c
-PARAM_CONFIG_HEADER_FILE="self_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/sm/configure.params b/ompi/mca/btl/sm/configure.params
index 7c5b6aab9e..3513f8d956 100644
--- a/ompi/mca/btl/sm/configure.params
+++ b/ompi/mca/btl/sm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_sm.c
-PARAM_CONFIG_HEADER_FILE="sm_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/tcp/configure.params b/ompi/mca/btl/tcp/configure.params
index 0125b5cdf7..3513f8d956 100644
--- a/ompi/mca/btl/tcp/configure.params
+++ b/ompi/mca/btl/tcp/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_tcp.c
-PARAM_CONFIG_HEADER_FILE="tcp_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/template/configure.params b/ompi/mca/btl/template/configure.params
index f67d3e05e4..3513f8d956 100644
--- a/ompi/mca/btl/template/configure.params
+++ b/ompi/mca/btl/template/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_template.c
-PARAM_CONFIG_HEADER_FILE="template_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/btl/udapl/configure.params b/ompi/mca/btl/udapl/configure.params
index f18349bf29..3513f8d956 100644
--- a/ompi/mca/btl/udapl/configure.params
+++ b/ompi/mca/btl/udapl/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=btl_udapl.c
-PARAM_CONFIG_HEADER_FILE="udapl_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/coll/basic/configure.params b/ompi/mca/coll/basic/configure.params
index 8203556db5..1b880fa432 100644
--- a/ompi/mca/coll/basic/configure.params
+++ b/ompi/mca/coll/basic/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=coll_basic.c
 PARAM_CONFIG_FILES=Makefile
diff --git a/ompi/mca/coll/demo/configure.params b/ompi/mca/coll/demo/configure.params
index 52d1e5799b..7c51f20dd6 100644
--- a/ompi/mca/coll/demo/configure.params
+++ b/ompi/mca/coll/demo/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
diff --git a/ompi/mca/coll/hierarch/configure.params b/ompi/mca/coll/hierarch/configure.params
index 83cdc7e9f7..3513f8d956 100644
--- a/ompi/mca/coll/hierarch/configure.params
+++ b/ompi/mca/coll/hierarch/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,8 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=coll_hierarch.c
-PARAM_CONFIG_HEADER_FILE=coll_hierarch_config.h
 PARAM_CONFIG_FILES="Makefile"
-PARAM_CONFIG_AUX_DIR=config
-PARAM_WANT_COMPILE_EXTERNAL=1
diff --git a/ompi/mca/coll/libnbc/configure.params b/ompi/mca/coll/libnbc/configure.params
index 8c7ff89e80..e35a45dd44 100644
--- a/ompi/mca/coll/libnbc/configure.params
+++ b/ompi/mca/coll/libnbc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=ompi_component.c
 PARAM_CONFIG_FILES=Makefile
diff --git a/ompi/mca/coll/self/configure.params b/ompi/mca/coll/self/configure.params
index 9f39aa261a..e35a45dd44 100644
--- a/ompi/mca/coll/self/configure.params
+++ b/ompi/mca/coll/self/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=coll_self.c
 PARAM_CONFIG_FILES=Makefile
diff --git a/ompi/mca/coll/sm/configure.params b/ompi/mca/coll/sm/configure.params
index 254f36f23f..e35a45dd44 100644
--- a/ompi/mca/coll/sm/configure.params
+++ b/ompi/mca/coll/sm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=coll_sm.c
 PARAM_CONFIG_FILES=Makefile
diff --git a/ompi/mca/coll/tuned/configure.params b/ompi/mca/coll/tuned/configure.params
index 0cffeb4c0a..1b880fa432 100644
--- a/ompi/mca/coll/tuned/configure.params
+++ b/ompi/mca/coll/tuned/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=coll_tuned.c
 PARAM_CONFIG_FILES=Makefile
diff --git a/ompi/mca/common/portals/configure.params b/ompi/mca/common/portals/configure.params
index 39a4429a02..3513f8d956 100644
--- a/ompi/mca/common/portals/configure.params
+++ b/ompi/mca/common/portals/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=common_portals.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/common/sm/configure.params b/ompi/mca/common/sm/configure.params
index c52f478c31..3513f8d956 100644
--- a/ompi/mca/common/sm/configure.params
+++ b/ompi/mca/common/sm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=common_sm.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/io/romio/configure.params b/ompi/mca/io/romio/configure.params
index 6a3a89eb1a..99b2444a56 100644
--- a/ompi/mca/io/romio/configure.params
+++ b/ompi/mca/io/romio/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,7 +21,5 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=src/io_romio_component.c
-PARAM_CONFIG_HEADER_FILE="src/romio_config.h"
 PARAM_CONFIG_FILES="Makefile"
 
diff --git a/ompi/mca/mpool/gm/configure.params b/ompi/mca/mpool/gm/configure.params
index f7a52411f3..7a3c339e5d 100644
--- a/ompi/mca/mpool/gm/configure.params
+++ b/ompi/mca/mpool/gm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,7 +21,6 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=mpool_gm_module.c
 PARAM_CONFIG_FILES="Makefile"
 
 
diff --git a/ompi/mca/mpool/mvapi/configure.params b/ompi/mca/mpool/mvapi/configure.params
index 7a841d1514..3513f8d956 100644
--- a/ompi/mca/mpool/mvapi/configure.params
+++ b/ompi/mca/mpool/mvapi/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=mpool_mvapi_component.c
-PARAM_CONFIG_HEADER_FILE="mvapi_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/mpool/openib/configure.params b/ompi/mca/mpool/openib/configure.params
index 6b58d62474..3513f8d956 100644
--- a/ompi/mca/mpool/openib/configure.params
+++ b/ompi/mca/mpool/openib/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=mpool_openib_component.c
-PARAM_CONFIG_HEADER_FILE="openib_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/mpool/rdma/configure.params b/ompi/mca/mpool/rdma/configure.params
index ca96d12ffa..71d3c8009d 100644
--- a/ompi/mca/mpool/rdma/configure.params
+++ b/ompi/mca/mpool/rdma/configure.params
@@ -11,6 +11,8 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2006      Voltaire. All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 #
 # $COPYRIGHT$
 #
@@ -21,5 +23,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=mpool_rdma_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/mpool/sm/configure.params b/ompi/mca/mpool/sm/configure.params
index 449aced223..3513f8d956 100644
--- a/ompi/mca/mpool/sm/configure.params
+++ b/ompi/mca/mpool/sm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=mpool_sm_component.c
-PARAM_CONFIG_HEADER_FILE="sm_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/mpool/udapl/configure.params b/ompi/mca/mpool/udapl/configure.params
index 97f25a018c..bd51689ae2 100644
--- a/ompi/mca/mpool/udapl/configure.params
+++ b/ompi/mca/mpool/udapl/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,5 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=mpool_udapl_module.c
 PARAM_CONFIG_FILES="Makefile"
 
diff --git a/ompi/mca/pml/cm/configure.params b/ompi/mca/pml/cm/configure.params
index cbd49d24d3..95606fb405 100644
--- a/ompi/mca/pml/cm/configure.params
+++ b/ompi/mca/pml/cm/configure.params
@@ -2,6 +2,8 @@
 #
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
diff --git a/ompi/mca/pml/dr/configure.params b/ompi/mca/pml/dr/configure.params
index b2509bc196..3513f8d956 100644
--- a/ompi/mca/pml/dr/configure.params
+++ b/ompi/mca/pml/dr/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pml_dr.c
-PARAM_CONFIG_HEADER_FILE="dr_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/pml/example/configure.params b/ompi/mca/pml/example/configure.params
index e77872518d..3517900825 100644
--- a/ompi/mca/pml/example/configure.params
+++ b/ompi/mca/pml/example/configure.params
@@ -8,6 +8,8 @@
 #                         reserved.
 # Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,6 +19,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pml_teg.c
-PARAM_CONFIG_HEADER_FILE="example_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/pml/ob1/configure.params b/ompi/mca/pml/ob1/configure.params
index e0b7be4732..3513f8d956 100644
--- a/ompi/mca/pml/ob1/configure.params
+++ b/ompi/mca/pml/ob1/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pml_ob1.c
-PARAM_CONFIG_HEADER_FILE="ob1_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/ompi/mca/topo/unity/configure.params b/ompi/mca/topo/unity/configure.params
index 07599f05d2..99b2444a56 100644
--- a/ompi/mca/topo/unity/configure.params
+++ b/ompi/mca/topo/unity/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,5 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=src/topo_unity.c
 PARAM_CONFIG_FILES="Makefile"
 
diff --git a/opal/mca/maffinity/first_use/configure.params b/opal/mca/maffinity/first_use/configure.params
index abf8f56797..8fc44480a6 100644
--- a/opal/mca/maffinity/first_use/configure.params
+++ b/opal/mca/maffinity/first_use/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=maffinity_first_use_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/opal/mca/maffinity/libnuma/configure.params b/opal/mca/maffinity/libnuma/configure.params
index c8dbee125b..8fc44480a6 100644
--- a/opal/mca/maffinity/libnuma/configure.params
+++ b/opal/mca/maffinity/libnuma/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=maffinity_libnuma_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/opal/mca/paffinity/linux/configure.params b/opal/mca/paffinity/linux/configure.params
index f926f3d1c5..8fc44480a6 100644
--- a/opal/mca/paffinity/linux/configure.params
+++ b/opal/mca/paffinity/linux/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=paffinity_linux_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/opal/mca/paffinity/solaris/configure.params b/opal/mca/paffinity/solaris/configure.params
index 4996c5d3a5..8fc44480a6 100644
--- a/opal/mca/paffinity/solaris/configure.params
+++ b/opal/mca/paffinity/solaris/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=paffinity_solaris_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/opal/mca/paffinity/windows/configure.params b/opal/mca/paffinity/windows/configure.params
index f893bb491c..8fc44480a6 100644
--- a/opal/mca/paffinity/windows/configure.params
+++ b/opal/mca/paffinity/windows/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=paffinity_windows_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/errmgr/bproc/configure.params b/orte/mca/errmgr/bproc/configure.params
index dfebb2cc50..3513f8d956 100644
--- a/orte/mca/errmgr/bproc/configure.params
+++ b/orte/mca/errmgr/bproc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=errmgr_bproc_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/errmgr/hnp/configure.params b/orte/mca/errmgr/hnp/configure.params
index bec31b8d4a..3513f8d956 100644
--- a/orte/mca/errmgr/hnp/configure.params
+++ b/orte/mca/errmgr/hnp/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=errmgr_hnp_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/errmgr/orted/configure.params b/orte/mca/errmgr/orted/configure.params
index 3be23d4b25..3513f8d956 100644
--- a/orte/mca/errmgr/orted/configure.params
+++ b/orte/mca/errmgr/orted/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=errmgr_orted_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/errmgr/proxy/configure.params b/orte/mca/errmgr/proxy/configure.params
index 9a1dd9a6a9..3513f8d956 100644
--- a/orte/mca/errmgr/proxy/configure.params
+++ b/orte/mca/errmgr/proxy/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=errmgr_proxy_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/gpr/null/configure.params b/orte/mca/gpr/null/configure.params
index ef3b260c5e..3513f8d956 100644
--- a/orte/mca/gpr/null/configure.params
+++ b/orte/mca/gpr/null/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=gpr_null.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/gpr/proxy/configure.params b/orte/mca/gpr/proxy/configure.params
index 51612811b1..3513f8d956 100644
--- a/orte/mca/gpr/proxy/configure.params
+++ b/orte/mca/gpr/proxy/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=gpr_proxy.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/gpr/replica/configure.params b/orte/mca/gpr/replica/configure.params
index 6937a7199b..e4f8bd17f5 100644
--- a/orte/mca/gpr/replica/configure.params
+++ b/orte/mca/gpr/replica/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=api_layer/gpr_replica_del_index_api.c
 PARAM_CONFIG_FILES="Makefile api_layer/Makefile transition_layer/Makefile functional_layer/Makefile communications/Makefile"
diff --git a/orte/mca/iof/null/configure.params b/orte/mca/iof/null/configure.params
index af04d9a9b9..3513f8d956 100644
--- a/orte/mca/iof/null/configure.params
+++ b/orte/mca/iof/null/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=iof_null.h
-PARAM_CONFIG_HEADER_FILE="iof_null_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/iof/proxy/configure.params b/orte/mca/iof/proxy/configure.params
index ec3f657876..3513f8d956 100644
--- a/orte/mca/iof/proxy/configure.params
+++ b/orte/mca/iof/proxy/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=iof_proxy.c
-PARAM_CONFIG_HEADER_FILE="iof_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/iof/svc/configure.params b/orte/mca/iof/svc/configure.params
index ec3f657876..3513f8d956 100644
--- a/orte/mca/iof/svc/configure.params
+++ b/orte/mca/iof/svc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=iof_proxy.c
-PARAM_CONFIG_HEADER_FILE="iof_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ns/proxy/configure.params b/orte/mca/ns/proxy/configure.params
index a0ccbf55aa..3513f8d956 100644
--- a/orte/mca/ns/proxy/configure.params
+++ b/orte/mca/ns/proxy/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ns_proxy.c
-PARAM_CONFIG_HEADER_FILE="ns_proxy.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ns/replica/configure.params b/orte/mca/ns/replica/configure.params
index 3d04f54b19..3513f8d956 100644
--- a/orte/mca/ns/replica/configure.params
+++ b/orte/mca/ns/replica/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ns_replica.c
-PARAM_CONFIG_HEADER_FILE="ns_replica.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/odls/bproc/configure.params b/orte/mca/odls/bproc/configure.params
index 77969f612b..3513f8d956 100644
--- a/orte/mca/odls/bproc/configure.params
+++ b/orte/mca/odls/bproc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=odls_bproc_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/odls/default/configure.params b/orte/mca/odls/default/configure.params
index 28850ed237..8fc44480a6 100644
--- a/orte/mca/odls/default/configure.params
+++ b/orte/mca/odls/default/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=odls_default_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/odls/process/configure.params b/orte/mca/odls/process/configure.params
index 4679937270..660033a54b 100755
--- a/orte/mca/odls/process/configure.params
+++ b/orte/mca/odls/process/configure.params
@@ -3,6 +3,8 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -10,5 +12,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=odls_process_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/oob/tcp/configure.params b/orte/mca/oob/tcp/configure.params
index d33c512b90..3513f8d956 100644
--- a/orte/mca/oob/tcp/configure.params
+++ b/orte/mca/oob/tcp/configure.params
@@ -10,15 +10,15 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
 # 
 # $HEADER$
 #
-                                                                                                            
+
 # Specific to this module
-                                                                                                            
-PARAM_INIT_FILE=oob_tcp.c
-PARAM_CONFIG_HEADER_FILE="oob_tcp_config.h"
+
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/bproc/configure.params b/orte/mca/pls/bproc/configure.params
index 027af7398d..3513f8d956 100644
--- a/orte/mca/pls/bproc/configure.params
+++ b/orte/mca/pls/bproc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pls_bproc.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/cnos/configure.params b/orte/mca/pls/cnos/configure.params
index a597d81a3b..3517900825 100644
--- a/orte/mca/pls/cnos/configure.params
+++ b/orte/mca/pls/cnos/configure.params
@@ -8,6 +8,8 @@
 #                         reserved.
 # Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pls_cnos.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/gridengine/configure.params b/orte/mca/pls/gridengine/configure.params
index 63426e8094..866338b2c7 100644
--- a/orte/mca/pls/gridengine/configure.params
+++ b/orte/mca/pls/gridengine/configure.params
@@ -12,6 +12,8 @@
 #                         All rights reserved.
 # Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
 #                         Use is subject to license terms.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -21,6 +23,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pls_gridengine_component.c
-PARAM_CONFIG_HEADER_FILE="pls_gridengine_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/poe/configure.params b/orte/mca/pls/poe/configure.params
index cf322936e2..8fc44480a6 100644
--- a/orte/mca/pls/poe/configure.params
+++ b/orte/mca/pls/poe/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,6 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=pls_poe_component.c
-PARAM_CONFIG_HEADER_FILE="pls_poe_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/proxy/configure.params b/orte/mca/pls/proxy/configure.params
index 9be71c7199..3513f8d956 100644
--- a/orte/mca/pls/proxy/configure.params
+++ b/orte/mca/pls/proxy/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=pls_proxy.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/rsh/configure.params b/orte/mca/pls/rsh/configure.params
index ad766df559..8fc44480a6 100644
--- a/orte/mca/pls/rsh/configure.params
+++ b/orte/mca/pls/rsh/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=pls_rsh_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/slurm/configure.params b/orte/mca/pls/slurm/configure.params
index 876d6d3d14..8fc44480a6 100644
--- a/orte/mca/pls/slurm/configure.params
+++ b/orte/mca/pls/slurm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=pls_slurm_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/tm/configure.params b/orte/mca/pls/tm/configure.params
index defaf69128..8fc44480a6 100644
--- a/orte/mca/pls/tm/configure.params
+++ b/orte/mca/pls/tm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=pls_tm_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/xcpu/configure.params b/orte/mca/pls/xcpu/configure.params
index b3a26176aa..4203df785e 100644
--- a/orte/mca/pls/xcpu/configure.params
+++ b/orte/mca/pls/xcpu/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-
-PARAM_INIT_FILE=pls_xcpu.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/pls/xgrid/configure.params b/orte/mca/pls/xgrid/configure.params
index c3968b743e..8fc44480a6 100644
--- a/orte/mca/pls/xgrid/configure.params
+++ b/orte/mca/pls/xgrid/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=src/pls_xgrid_component.m
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/bjs/configure.params b/orte/mca/ras/bjs/configure.params
index 1cb9799338..3513f8d956 100644
--- a/orte/mca/ras/bjs/configure.params
+++ b/orte/mca/ras/bjs/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ras_bjs.c
-PARAM_CONFIG_HEADER_FILE="bjs_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/dash_host/configure.params b/orte/mca/ras/dash_host/configure.params
index 01ffd8488e..e959acf694 100644
--- a/orte/mca/ras/dash_host/configure.params
+++ b/orte/mca/ras/dash_host/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,5 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ras_dash_host_component.c
+
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/gridengine/configure.params b/orte/mca/ras/gridengine/configure.params
index 365531c31a..866338b2c7 100644
--- a/orte/mca/ras/gridengine/configure.params
+++ b/orte/mca/ras/gridengine/configure.params
@@ -12,6 +12,8 @@
 #                         All rights reserved.
 # Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
 #                         Use is subject to license terms.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -21,6 +23,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ras_gridengine.c
-PARAM_CONFIG_HEADER_FILE="ras_gridengine.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/loadleveler/configure.params b/orte/mca/ras/loadleveler/configure.params
index 86d2325001..8fc44480a6 100644
--- a/orte/mca/ras/loadleveler/configure.params
+++ b/orte/mca/ras/loadleveler/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=ras_loadleveler_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/localhost/configure.params b/orte/mca/ras/localhost/configure.params
index a1d7847dc1..3513f8d956 100644
--- a/orte/mca/ras/localhost/configure.params
+++ b/orte/mca/ras/localhost/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ras_localhost_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/lsf_bproc/configure.params b/orte/mca/ras/lsf_bproc/configure.params
index 6657030a6c..3513f8d956 100644
--- a/orte/mca/ras/lsf_bproc/configure.params
+++ b/orte/mca/ras/lsf_bproc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=ras_lsf_bproc.c
-PARAM_CONFIG_HEADER_FILE="lsf_bproc_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/slurm/configure.params b/orte/mca/ras/slurm/configure.params
index 06163ccd39..8fc44480a6 100644
--- a/orte/mca/ras/slurm/configure.params
+++ b/orte/mca/ras/slurm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=src/ras_slurm_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/tm/configure.params b/orte/mca/ras/tm/configure.params
index 4d0a12aad5..8fc44480a6 100644
--- a/orte/mca/ras/tm/configure.params
+++ b/orte/mca/ras/tm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=ras_tm_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/ras/xgrid/configure.params b/orte/mca/ras/xgrid/configure.params
index 9a20b28ed9..8fc44480a6 100644
--- a/orte/mca/ras/xgrid/configure.params
+++ b/orte/mca/ras/xgrid/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=src/ras_xgrid_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rds/hostfile/configure.params b/orte/mca/rds/hostfile/configure.params
index d4775a37ad..3513f8d956 100644
--- a/orte/mca/rds/hostfile/configure.params
+++ b/orte/mca/rds/hostfile/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rds_hostfile.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rds/proxy/configure.params b/orte/mca/rds/proxy/configure.params
index 78194de47c..3513f8d956 100644
--- a/orte/mca/rds/proxy/configure.params
+++ b/orte/mca/rds/proxy/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rds_proxy.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rds/resfile/configure.params b/orte/mca/rds/resfile/configure.params
index 28100488ca..3513f8d956 100644
--- a/orte/mca/rds/resfile/configure.params
+++ b/orte/mca/rds/resfile/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rds_resfile.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rmaps/round_robin/configure.params b/orte/mca/rmaps/round_robin/configure.params
index 94610baec3..3513f8d956 100644
--- a/orte/mca/rmaps/round_robin/configure.params
+++ b/orte/mca/rmaps/round_robin/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rmaps_rr.c
-PARAM_CONFIG_HEADER_FILE="rmaps_rr_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rmgr/cnos/configure.params b/orte/mca/rmgr/cnos/configure.params
index 785350bc4f..3517900825 100644
--- a/orte/mca/rmgr/cnos/configure.params
+++ b/orte/mca/rmgr/cnos/configure.params
@@ -8,6 +8,8 @@
 #                         reserved.
 # Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rmgr_cnos.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rmgr/proxy/configure.params b/orte/mca/rmgr/proxy/configure.params
index 1f97a6a23a..3517900825 100644
--- a/orte/mca/rmgr/proxy/configure.params
+++ b/orte/mca/rmgr/proxy/configure.params
@@ -8,6 +8,8 @@
 #                         reserved.
 # Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,6 +19,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rmgr_proxy.c
-PARAM_CONFIG_HEADER_FILE="proxy_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rmgr/urm/configure.params b/orte/mca/rmgr/urm/configure.params
index a8a3147a0b..3513f8d956 100644
--- a/orte/mca/rmgr/urm/configure.params
+++ b/orte/mca/rmgr/urm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rmgr_urm.c
-PARAM_CONFIG_HEADER_FILE="urm_config.h"
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rml/cnos/configure.params b/orte/mca/rml/cnos/configure.params
index 092b201679..3513f8d956 100644
--- a/orte/mca/rml/cnos/configure.params
+++ b/orte/mca/rml/cnos/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,5 +21,4 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=rml_cnos.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/rml/oob/configure.params b/orte/mca/rml/oob/configure.params
index 7a8b95cfc1..3513f8d956 100644
--- a/orte/mca/rml/oob/configure.params
+++ b/orte/mca/rml/oob/configure.params
@@ -10,15 +10,15 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
 # 
 # $HEADER$
 #
-                                                                                                            
+
 # Specific to this module
-                                                                                                            
-PARAM_INIT_FILE=rml_oob.c
-PARAM_CONFIG_HEADER_FILE="rml_oob_config.h"
+
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/bproc/configure.params b/orte/mca/sds/bproc/configure.params
index 929ece1d97..8fc44480a6 100644
--- a/orte/mca/sds/bproc/configure.params
+++ b/orte/mca/sds/bproc/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_bproc_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/cnos/configure.params b/orte/mca/sds/cnos/configure.params
index 2a0e139a3c..8fc44480a6 100644
--- a/orte/mca/sds/cnos/configure.params
+++ b/orte/mca/sds/cnos/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_cnos_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/env/configure.params b/orte/mca/sds/env/configure.params
index 2129928519..8fc44480a6 100644
--- a/orte/mca/sds/env/configure.params
+++ b/orte/mca/sds/env/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_env_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/pipe/configure.params b/orte/mca/sds/pipe/configure.params
index 03dc5844b1..8fc44480a6 100644
--- a/orte/mca/sds/pipe/configure.params
+++ b/orte/mca/sds/pipe/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_pipe_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/portals_utcp/configure.params b/orte/mca/sds/portals_utcp/configure.params
index 2a0e139a3c..8fc44480a6 100644
--- a/orte/mca/sds/portals_utcp/configure.params
+++ b/orte/mca/sds/portals_utcp/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_cnos_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/seed/configure.params b/orte/mca/sds/seed/configure.params
index a7da5f7261..8fc44480a6 100644
--- a/orte/mca/sds/seed/configure.params
+++ b/orte/mca/sds/seed/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_seed_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/singleton/configure.params b/orte/mca/sds/singleton/configure.params
index 6a8e0df757..8fc44480a6 100644
--- a/orte/mca/sds/singleton/configure.params
+++ b/orte/mca/sds/singleton/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_singleton_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/slurm/configure.params b/orte/mca/sds/slurm/configure.params
index 55a1842836..8fc44480a6 100644
--- a/orte/mca/sds/slurm/configure.params
+++ b/orte/mca/sds/slurm/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_slurm_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/sds/xcpu/configure.params b/orte/mca/sds/xcpu/configure.params
index 301de8a3b9..8fc44480a6 100644
--- a/orte/mca/sds/xcpu/configure.params
+++ b/orte/mca/sds/xcpu/configure.params
@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,5 +19,4 @@
 # $HEADER$
 #
 
-PARAM_INIT_FILE=sds_xcpu_component.c
 PARAM_CONFIG_FILES="Makefile"
diff --git a/orte/mca/smr/bproc/configure.params b/orte/mca/smr/bproc/configure.params
index d0051892b2..3513f8d956 100644
--- a/orte/mca/smr/bproc/configure.params
+++ b/orte/mca/smr/bproc/configure.params
@@ -10,14 +10,15 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
 # 
 # $HEADER$
 #
-                                                                                                            
+
 # Specific to this module
-                                                                                                            
-PARAM_INIT_FILE=smr_bproc.c
+
 PARAM_CONFIG_FILES="Makefile"