diff --git a/ompi/mca/pml/teg/pml_ptl_array.h b/ompi/mca/pml/teg/pml_ptl_array.h
index 4d17ba168e..3f17639f96 100644
--- a/ompi/mca/pml/teg/pml_ptl_array.h
+++ b/ompi/mca/pml/teg/pml_ptl_array.h
@@ -35,7 +35,7 @@ extern opal_class_t mca_pml_teg_ptl_array_t_class;
 struct mca_ptl_proc_t {
     int ptl_weight;                       /**< PTL weight for scheduling */
     struct mca_ptl_base_peer_t* ptl_peer; /**< PTL addressing info */
-    struct mca_pml_base_ptl_t* ptl_base;  /**< PML specific PTL info */
+    struct mca_pml_teg_ptl_t* ptl_base;   /**< PML specific PTL info */
     mca_ptl_base_module_t *ptl;           /**< PTL module */
 };
 typedef struct mca_ptl_proc_t mca_ptl_proc_t;
diff --git a/ompi/mca/pml/teg/pml_teg.c b/ompi/mca/pml/teg/pml_teg.c
index 81ba10867f..df8342ae13 100644
--- a/ompi/mca/pml/teg/pml_teg.c
+++ b/ompi/mca/pml/teg/pml_teg.c
@@ -340,7 +340,7 @@ int mca_pml_teg_add_procs(ompi_proc_t** procs, size_t nprocs)
 
         for(n_index = 0; n_index < n_size; n_index++) {
             struct mca_ptl_proc_t* proc_ptl = mca_ptl_array_get_index(&proc_pml->proc_ptl_next, n_index);
-            struct mca_ptl_base_module_t *ptl = proc_ptl->ptl;
+            mca_ptl_base_module_t *ptl = proc_ptl->ptl;
             double weight;
 
             /* compute weighting factor for this ptl */
@@ -353,17 +353,17 @@ int mca_pml_teg_add_procs(ompi_proc_t** procs, size_t nprocs)
             /*
              * save/create ptl extension for use by pml
              */
-            proc_ptl->ptl_base = ptl->ptl_base;
-            if (NULL == proc_ptl->ptl_base && 
+            if (NULL == ptl->ptl_base && 
                 ptl->ptl_cache_bytes > 0 &&
                 NULL != ptl->ptl_request_init &&
                 NULL != ptl->ptl_request_fini) {
 
-                mca_pml_base_ptl_t* ptl_base = OBJ_NEW(mca_pml_base_ptl_t);
+                mca_pml_teg_ptl_t* ptl_base = OBJ_NEW(mca_pml_teg_ptl_t);
                 ptl_base->ptl = ptl;
                 ptl_base->ptl_cache_size = ptl->ptl_cache_size;
-                proc_ptl->ptl_base = ptl->ptl_base = ptl_base;
+                ptl->ptl_base = (struct mca_pml_base_ptl_t*)ptl_base;
             }
+            proc_ptl->ptl_base = (mca_pml_teg_ptl_t*)ptl->ptl_base;
 
             /* check to see if this ptl is already in the array of ptls used for first
              * fragments - if not add it.
diff --git a/ompi/mca/pml/teg/pml_teg_ptl.c b/ompi/mca/pml/teg/pml_teg_ptl.c
index 1092459dc9..8ed3714c69 100644
--- a/ompi/mca/pml/teg/pml_teg_ptl.c
+++ b/ompi/mca/pml/teg/pml_teg_ptl.c
@@ -19,7 +19,7 @@
 #include "pml_teg_ptl.h"
 
 
-static void mca_pml_base_ptl_construct(mca_pml_base_ptl_t* ptl)
+static void mca_pml_teg_ptl_construct(mca_pml_teg_ptl_t* ptl)
 {
     OBJ_CONSTRUCT(&ptl->ptl_cache, opal_list_t);
     OBJ_CONSTRUCT(&ptl->ptl_cache_lock, opal_mutex_t);
@@ -28,16 +28,16 @@ static void mca_pml_base_ptl_construct(mca_pml_base_ptl_t* ptl)
     ptl->ptl_cache_alloc = 0;
 }
 
-static void mca_pml_base_ptl_destruct(mca_pml_base_ptl_t* ptl)
+static void mca_pml_teg_ptl_destruct(mca_pml_teg_ptl_t* ptl)
 {
     OBJ_DESTRUCT(&ptl->ptl_cache);
     OBJ_DESTRUCT(&ptl->ptl_cache_lock);
 }
 
 OBJ_CLASS_INSTANCE(
-    mca_pml_base_ptl_t,
+    mca_pml_teg_ptl_t,
     opal_list_t,
-    mca_pml_base_ptl_construct,
-    mca_pml_base_ptl_destruct
+    mca_pml_teg_ptl_construct,
+    mca_pml_teg_ptl_destruct
 );
 
diff --git a/ompi/mca/pml/teg/pml_teg_ptl.h b/ompi/mca/pml/teg/pml_teg_ptl.h
index 883e7a198a..d66c1055fe 100644
--- a/ompi/mca/pml/teg/pml_teg_ptl.h
+++ b/ompi/mca/pml/teg/pml_teg_ptl.h
@@ -25,16 +25,16 @@ extern "C" {
 #endif
 
 
-struct mca_pml_base_ptl_t {
+struct mca_pml_teg_ptl_t {
     opal_list_t       ptl_cache;       /**< cache of send requests */
     size_t            ptl_cache_size;  /**< maximum size of cache */
     size_t            ptl_cache_alloc; /**< current number of allocated items */
     opal_mutex_t      ptl_cache_lock;  /**< lock for queue access */
     struct mca_ptl_base_module_t* ptl; /**< back pointer to ptl */
 };
-typedef struct mca_pml_base_ptl_t mca_pml_base_ptl_t;
+typedef struct mca_pml_teg_ptl_t mca_pml_teg_ptl_t;
 
-OBJ_CLASS_DECLARATION(mca_pml_base_ptl_t);
+OBJ_CLASS_DECLARATION(mca_pml_teg_ptl_t);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/ompi/mca/pml/teg/pml_teg_sendreq.h b/ompi/mca/pml/teg/pml_teg_sendreq.h
index 1ae9a5a0ec..87e12ffe44 100644
--- a/ompi/mca/pml/teg/pml_teg_sendreq.h
+++ b/ompi/mca/pml/teg/pml_teg_sendreq.h
@@ -43,7 +43,7 @@ OBJ_CLASS_DECLARATION(mca_pml_teg_send_request_t);
 {                                                                          \
     mca_pml_proc_t *proc = mca_pml_teg_proc_lookup_remote(comm,dst);       \
     mca_ptl_proc_t* ptl_proc;                                              \
-    mca_pml_base_ptl_t* ptl_base;                                          \
+    mca_pml_teg_ptl_t* ptl_base;                                           \
                                                                            \
     if(NULL == proc) {                                                     \
        return OMPI_ERR_OUT_OF_RESOURCE;                                    \
@@ -125,7 +125,7 @@ OBJ_CLASS_DECLARATION(mca_pml_teg_send_request_t);
 #define MCA_PML_TEG_SEND_REQUEST_RETURN(sendreq)                           \
 {                                                                          \
     mca_ptl_base_module_t* ptl = (sendreq)->req_ptl;                       \
-    mca_pml_base_ptl_t* ptl_base = ptl->ptl_base;                          \
+    mca_pml_teg_ptl_t* ptl_base = (mca_pml_teg_ptl_t*)ptl->ptl_base;       \
                                                                            \
     /*  Let the base handle the reference counts */                        \
     MCA_PML_BASE_SEND_REQUEST_FINI((&sendreq->req_send));                  \