diff --git a/orte/tools/orte-info/components.c b/orte/tools/orte-info/components.c
index 4ab835daa4..fbc92158c9 100644
--- a/orte/tools/orte-info/components.c
+++ b/orte/tools/orte-info/components.c
@@ -58,7 +58,7 @@ OBJ_CLASS_INSTANCE(orte_info_component_map_t,
                    component_map_construct,
                    component_map_destruct);
 
-opal_pointer_array_t component_map = {{0}};
+opal_pointer_array_t orte_component_map = {{0}};
 
 /*
  * Private variables
@@ -76,11 +76,11 @@ void orte_info_components_open(void)
     opened_components = true;
 
     /* init the map */
-    OBJ_CONSTRUCT(&component_map, opal_pointer_array_t);
-    opal_pointer_array_init(&component_map, 256, INT_MAX, 128);
+    OBJ_CONSTRUCT(&orte_component_map, opal_pointer_array_t);
+    opal_pointer_array_init(&orte_component_map, 256, INT_MAX, 128);
 
-    opal_info_register_framework_params(&component_map);
-    orte_info_register_framework_params(&component_map);
+    opal_info_register_framework_params(&orte_component_map);
+    orte_info_register_framework_params(&orte_component_map);
 }
 
 /* 
@@ -98,13 +98,13 @@ void orte_info_components_close(void)
     orte_info_close_components ();
     opal_info_close_components ();
     
-    for (i=0; i < component_map.size; i++) {
-        if (NULL != (map = (orte_info_component_map_t*)opal_pointer_array_get_item(&component_map, i))) {
+    for (i=0; i < orte_component_map.size; i++) {
+        if (NULL != (map = (orte_info_component_map_t*)opal_pointer_array_get_item(&orte_component_map, i))) {
             OBJ_RELEASE(map);
         }
     }
 
-    OBJ_DESTRUCT(&component_map);
+    OBJ_DESTRUCT(&orte_component_map);
     
     opened_components = false;
 }
diff --git a/orte/tools/orte-info/orte-info.h b/orte/tools/orte-info/orte-info.h
index 873d2597f3..e540e42ad7 100644
--- a/orte/tools/orte-info/orte-info.h
+++ b/orte/tools/orte-info/orte-info.h
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -115,7 +117,7 @@ typedef struct {
 } orte_info_component_map_t;
 ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_info_component_map_t);
 
-extern opal_pointer_array_t component_map;
+extern opal_pointer_array_t orte_component_map;
 
 void orte_info_components_open(void);
 void orte_info_components_close(void);
diff --git a/orte/tools/orte-info/version.c b/orte/tools/orte-info/version.c
index cd45d786ac..6fb94ea69f 100644
--- a/orte/tools/orte-info/version.c
+++ b/orte/tools/orte-info/version.c
@@ -166,8 +166,8 @@ void orte_info_show_component_version(const char *type_name,
     
     /* Now that we have a valid type, find the right component list */
     components = NULL;
-    for (j=0; j < component_map.size; j++) {
-        if (NULL == (map = (orte_info_component_map_t*)opal_pointer_array_get_item(&component_map, j))) {
+    for (j=0; j < orte_component_map.size; j++) {
+        if (NULL == (map = (orte_info_component_map_t*)opal_pointer_array_get_item(&orte_component_map, j))) {
             continue;
         }
         if (0 == strcmp(type_name, map->type)) {