diff --git a/opal/mca/shmem/base/base.h b/opal/mca/shmem/base/base.h
index 9ea20de541..57ee778560 100644
--- a/opal/mca/shmem/base/base.h
+++ b/opal/mca/shmem/base/base.h
@@ -124,14 +124,12 @@ OPAL_DECLSPEC extern bool opal_shmem_base_selected;
 /**
  * Global component struct for the selected component
  */
-OPAL_DECLSPEC extern const opal_shmem_base_component_2_0_0_t
-*opal_shmem_base_component;
+OPAL_DECLSPEC extern opal_shmem_base_component_t *opal_shmem_base_component;
 
 /**
  * Global module struct for the selected module
  */
-OPAL_DECLSPEC extern const opal_shmem_base_module_2_0_0_t
-*opal_shmem_base_module;
+OPAL_DECLSPEC extern opal_shmem_base_module_t *opal_shmem_base_module;
 
 /**
  * Runtime hint
diff --git a/opal/mca/shmem/base/shmem_base_select.c b/opal/mca/shmem/base/shmem_base_select.c
index 5826ab7a7e..c4651e9b1a 100644
--- a/opal/mca/shmem/base/shmem_base_select.c
+++ b/opal/mca/shmem/base/shmem_base_select.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * 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) 2007-2015 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010-2011 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * $COPYRIGHT$
@@ -36,8 +36,8 @@
  * globals
  */
 bool opal_shmem_base_selected = false;
-const opal_shmem_base_component_2_0_0_t *opal_shmem_base_component = NULL;
-const opal_shmem_base_module_2_0_0_t *opal_shmem_base_module = NULL;
+opal_shmem_base_component_t *opal_shmem_base_component = NULL;
+opal_shmem_base_module_t *opal_shmem_base_module = NULL;
 
 /* ////////////////////////////////////////////////////////////////////////// */