diff --git a/ompi/mca/btl/mx/btl_mx.h b/ompi/mca/btl/mx/btl_mx.h
index 9cc5b2a424..662226b620 100644
--- a/ompi/mca/btl/mx/btl_mx.h
+++ b/ompi/mca/btl/mx/btl_mx.h
@@ -42,7 +42,7 @@ extern "C" {
 #define MCA_BTL_HAS_MPOOL 1
 
 /**
- * Infiniband (TEMPLATE) BTL component.
+ * MX BTL component.
  */
 
 struct mca_btl_mx_component_t {
diff --git a/ompi/mca/btl/mx/btl_mx_component.c b/ompi/mca/btl/mx/btl_mx_component.c
index 30eb79752b..0413da1caf 100644
--- a/ompi/mca/btl/mx/btl_mx_component.c
+++ b/ompi/mca/btl/mx/btl_mx_component.c
@@ -44,7 +44,7 @@ mca_btl_mx_component_t mca_btl_mx_component = {
 
             MCA_BTL_BASE_VERSION_1_0_0,
 
-            "ib", /* MCA component name */
+            "mx", /* MCA component name */
             OMPI_MAJOR_VERSION,  /* MCA component major version */
             OMPI_MINOR_VERSION,  /* MCA component minor version */
             OMPI_RELEASE_VERSION,  /* MCA component release version */
@@ -75,7 +75,7 @@ static inline char* mca_btl_mx_param_register_string(
                                                      const char* default_value)
 {
     char *param_value;
-    int id = mca_base_param_register_string("btl","ib",param_name,NULL,default_value);
+    int id = mca_base_param_register_string("btl","mx",param_name,NULL,default_value);
     mca_base_param_lookup_string(id, &param_value);
     return param_value;
 }
@@ -84,7 +84,7 @@ static inline int mca_btl_mx_param_register_int(
         const char* param_name, 
         int default_value)
 {
-    int id = mca_base_param_register_int("btl","ib",param_name,NULL,default_value);
+    int id = mca_base_param_register_int("btl","mx",param_name,NULL,default_value);
     int param_value = default_value;
     mca_base_param_lookup_int(id,&param_value);
     return param_value;
@@ -113,8 +113,6 @@ int mca_btl_mx_component_open(void)
         mca_btl_mx_param_register_int ("free_list_max", 1024);
     mca_btl_mx_component.mx_free_list_inc =
         mca_btl_mx_param_register_int ("free_list_inc", 32);
-    mca_btl_mx_component.mx_mpool_name = 
-        mca_btl_mx_param_register_string("mpool", "ib"); 
     mca_btl_mx_module.super.btl_exclusivity =
         mca_btl_mx_param_register_int ("exclusivity", 0);
     mca_btl_mx_module.super.btl_eager_limit = 
diff --git a/ompi/mca/btl/mx/btl_mx_proc.c b/ompi/mca/btl/mx/btl_mx_proc.c
index 91ab91fb1a..af571ccc2e 100644
--- a/ompi/mca/btl/mx/btl_mx_proc.c
+++ b/ompi/mca/btl/mx/btl_mx_proc.c
@@ -43,7 +43,7 @@ void mca_btl_mx_proc_construct(mca_btl_mx_proc_t* proc)
 }
 
 /*
- * Cleanup ib proc instance
+ * Cleanup MX proc instance
  */
 
 void mca_btl_mx_proc_destruct(mca_btl_mx_proc_t* proc)