diff --git a/mpp/shmem.h4 b/mpp/shmem.h4
index 9240c0b5f..5679d639a 100644
--- a/mpp/shmem.h4
+++ b/mpp/shmem.h4
@@ -510,7 +510,7 @@ define(`SHMEM_CXX_WAIT_UNTIL_ALL',
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ALL')
 
 define(`SHMEM_CXX_WAIT_UNTIL_ALL_VECTOR',
-`static inline void shmem_wait_until_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
+`static inline void shmem_wait_until_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
     shmem_$1_wait_until_all_vector(ivars, nelems, status, cmp, cmp_values);
 }')dnl
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ALL_VECTOR')
@@ -522,7 +522,7 @@ define(`SHMEM_CXX_WAIT_UNTIL_ANY',
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ANY')
 
 define(`SHMEM_CXX_WAIT_UNTIL_ANY_VECTOR',
-`static inline size_t shmem_wait_until_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
+`static inline size_t shmem_wait_until_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
     return shmem_$1_wait_until_any_vector(ivars, nelems, status, cmp, cmp_values);
 }')dnl
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ANY_VECTOR')
@@ -534,7 +534,7 @@ define(`SHMEM_CXX_WAIT_UNTIL_SOME',
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_SOME')
 
 define(`SHMEM_CXX_WAIT_UNTIL_SOME_VECTOR',
-`static inline size_t shmem_wait_until_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *cmp_values) {
+`static inline size_t shmem_wait_until_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *cmp_values) {
     return shmem_$1_wait_until_some_vector(ivars, nelems, indices, status, cmp, cmp_values);
 }')dnl
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_SOME_VECTOR')
@@ -552,7 +552,7 @@ define(`SHMEM_CXX_TEST_ALL',
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ALL')
 
 define(`SHMEM_CXX_TEST_ALL_VECTOR',
-`static inline int shmem_test_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
+`static inline int shmem_test_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
     return shmem_$1_test_all_vector(ivars, nelems, status, cmp, cmp_values);
 }')dnl
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ALL_VECTOR')
@@ -564,7 +564,7 @@ define(`SHMEM_CXX_TEST_ANY',
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ANY')
 
 define(`SHMEM_CXX_TEST_ANY_VECTOR',
-`static inline size_t shmem_test_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
+`static inline size_t shmem_test_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
     return shmem_$1_test_any_vector(ivars, nelems, status, cmp, cmp_values);
 }')dnl
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ANY_VECTOR')
@@ -576,7 +576,7 @@ define(`SHMEM_CXX_TEST_SOME',
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_SOME')
 
 define(`SHMEM_CXX_TEST_SOME_VECTOR',
-`static inline size_t shmem_test_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *cmp_values) {
+`static inline size_t shmem_test_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *cmp_values) {
     return shmem_$1_test_some_vector(ivars, nelems, indices, status, cmp, cmp_values);
 }')dnl
 SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_SOME_VECTOR')
diff --git a/mpp/shmem_c_func.h4 b/mpp/shmem_c_func.h4
index 457309986..63a8d04f0 100644
--- a/mpp/shmem_c_func.h4
+++ b/mpp/shmem_c_func.h4
@@ -43,8 +43,8 @@ SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_global_exit(int status);
 
 SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_pe_accessible(int pe);
 SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_addr_accessible(const void *addr, int pe);
-SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_ptr(const void *target, int pe);
-SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_team_ptr(shmem_team_t team, const void *target, int pe);
+SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_ptr(const void *dest, int pe);
+SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_team_ptr(shmem_team_t team, const void *dest, int pe);
 
 SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_info_get_version(int *major, int *minor);
 SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_info_get_name(char *name);
@@ -500,15 +500,15 @@ define(`SHMEM_C_WAIT_UNTIL_SOME',
 SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_SOME')
 
 define(`SHMEM_C_WAIT_UNTIL_ALL_VECTOR',
-`SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_$1_wait_until_all_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
+`SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_$1_wait_until_all_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
 SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_ALL_VECTOR')
 
 define(`SHMEM_C_WAIT_UNTIL_ANY_VECTOR',
-`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_any_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
+`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_any_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
 SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_ANY_VECTOR')
 
 define(`SHMEM_C_WAIT_UNTIL_SOME_VECTOR',
-`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *values);')dnl
+`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *values);')dnl
 SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_SOME_VECTOR')
 
 define(`SHMEM_C_TEST',
@@ -528,15 +528,15 @@ define(`SHMEM_C_TEST_SOME',
 SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_SOME')
 
 define(`SHMEM_C_TEST_ALL_VECTOR',
-`SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_$1_test_all_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
+`SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_$1_test_all_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
 SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_ALL_VECTOR')
 
 define(`SHMEM_C_TEST_ANY_VECTOR',
-`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_any_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
+`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_any_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
 SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_ANY_VECTOR')
 
 define(`SHMEM_C_TEST_SOME_VECTOR',
-`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *values);')dnl
+`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *values);')dnl
 SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_SOME_VECTOR')
 
 SHMEM_FUNCTION_ATTRIBUTES uint64_t SHPRE()shmem_signal_wait_until(uint64_t *sig_addr, int cmp, uint64_t cmp_value);
diff --git a/src/remote_pointer_c.c b/src/remote_pointer_c.c
index 855b51df9..89e3e9ce3 100644
--- a/src/remote_pointer_c.c
+++ b/src/remote_pointer_c.c
@@ -37,21 +37,21 @@
 
 
 void SHMEM_FUNCTION_ATTRIBUTES *
-shmem_ptr(const void *target, int pe)
+shmem_ptr(const void *dest, int pe)
 {
     SHMEM_ERR_CHECK_INITIALIZED();
     SHMEM_ERR_CHECK_PE(pe);
-    SHMEM_ERR_CHECK_SYMMETRIC(target, 1);
+    SHMEM_ERR_CHECK_SYMMETRIC(dest, 1);
 
-    return shmem_internal_ptr(target, pe);
+    return shmem_internal_ptr(dest, pe);
 }
 
 void SHMEM_FUNCTION_ATTRIBUTES *
-shmem_team_ptr(shmem_team_t team, const void *target, int pe)
+shmem_team_ptr(shmem_team_t team, const void *dest, int pe)
 {
     SHMEM_ERR_CHECK_INITIALIZED();
     SHMEM_ERR_CHECK_PE(pe);
-    SHMEM_ERR_CHECK_SYMMETRIC(target, 1);
+    SHMEM_ERR_CHECK_SYMMETRIC(dest, 1);
 
     if (team == SHMEM_TEAM_INVALID) {
         return NULL;
@@ -59,5 +59,5 @@ shmem_team_ptr(shmem_team_t team, const void *target, int pe)
 
     int global_pe = shmem_team_translate_pe(team, pe, SHMEM_TEAM_WORLD);
 
-    return shmem_internal_ptr(target, global_pe);
+    return shmem_internal_ptr(dest, global_pe);
 }
diff --git a/src/synchronization_c.c4 b/src/synchronization_c.c4
index 6e3eef0f2..401e49e9c 100644
--- a/src/synchronization_c.c4
+++ b/src/synchronization_c.c4
@@ -252,7 +252,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_WAIT_UNTIL_ALL')
 #define SHMEM_DEF_WAIT_UNTIL_ALL_VECTOR(STYPE,TYPE)                                               \
     void SHMEM_FUNCTION_ATTRIBUTES                                                                \
     shmem_##STYPE##_wait_until_all_vector(TYPE *vars, size_t nelems,                              \
-                                           const int *status, int cond, TYPE *values)             \
+                                           const int *status, int cond, const TYPE *values)       \
     {                                                                                             \
         SHMEM_ERR_CHECK_INITIALIZED();                                                            \
         SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE));                                            \
@@ -338,7 +338,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_WAIT_UNTIL_ANY')
 #define SHMEM_DEF_WAIT_UNTIL_ANY_VECTOR(STYPE,TYPE)                                               \
     size_t SHMEM_FUNCTION_ATTRIBUTES                                                              \
     shmem_##STYPE##_wait_until_any_vector(TYPE *vars, size_t nelems,                              \
-                                    const int *status, int cond, TYPE *values)                    \
+                                    const int *status, int cond, const TYPE *values)              \
     {                                                                                             \
         SHMEM_ERR_CHECK_INITIALIZED();                                                            \
         SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE));                                            \
@@ -436,7 +436,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_WAIT_UNTIL_SOME')
 #define SHMEM_DEF_WAIT_UNTIL_SOME_VECTOR(STYPE,TYPE)                                           \
     size_t SHMEM_FUNCTION_ATTRIBUTES                                                           \
     shmem_##STYPE##_wait_until_some_vector(TYPE *vars, size_t nelems, size_t *indices,         \
-                                     const int *status, int cond, TYPE *values)                \
+                                     const int *status, int cond, const TYPE *values)          \
     {                                                                                          \
         SHMEM_ERR_CHECK_INITIALIZED();                                                         \
         SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE));                                         \
@@ -537,7 +537,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_TEST_ALL')
 #define SHMEM_DEF_TEST_ALL_VECTOR(STYPE,TYPE)                                                     \
     int SHMEM_FUNCTION_ATTRIBUTES                                                                 \
     shmem_##STYPE##_test_all_vector(TYPE *vars, size_t nelems, const int *status, int cond,       \
-                              TYPE *values)                                                       \
+                              const TYPE *values)                                                 \
     {                                                                                             \
         SHMEM_ERR_CHECK_INITIALIZED();                                                            \
         SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE));                                            \
@@ -607,7 +607,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_TEST_ANY')
 #define SHMEM_DEF_TEST_ANY_VECTOR(STYPE,TYPE)                                                     \
     size_t SHMEM_FUNCTION_ATTRIBUTES                                                              \
     shmem_##STYPE##_test_any_vector(TYPE *vars, size_t nelems, const int *status,                 \
-                              int cond, TYPE *values)                                             \
+                              int cond, const TYPE *values)                                       \
     {                                                                                             \
         SHMEM_ERR_CHECK_INITIALIZED();                                                            \
         SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE));                                            \
@@ -692,7 +692,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_TEST_SOME')
 #define SHMEM_DEF_TEST_SOME_VECTOR(STYPE,TYPE)                                                 \
     size_t SHMEM_FUNCTION_ATTRIBUTES                                                           \
     shmem_##STYPE##_test_some_vector(TYPE *vars, size_t nelems, size_t *indices,               \
-                               const int *status, int cond, TYPE *values)                      \
+                               const int *status, int cond, const TYPE *values)                \
     {                                                                                          \
         SHMEM_ERR_CHECK_INITIALIZED();                                                         \
         SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE));                                         \