diff --git a/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
index e2cf1451e3..5557e5e151 100644
--- a/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
@@ -107,7 +107,7 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
@@ -282,7 +282,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx);
+    LS = SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
index e147ccd8c4..dd75f4189a 100644
--- a/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
@@ -70,7 +70,7 @@ int EvolveProblemBDF(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "CVodeSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
index 3ae28a43ca..792e805365 100644
--- a/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
@@ -92,7 +92,7 @@ int EvolveDAEProblem(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "IDASetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp b/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
index e2cf1451e3..5557e5e151 100644
--- a/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
@@ -107,7 +107,7 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
@@ -282,7 +282,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx);
+    LS = SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp b/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
index e147ccd8c4..dd75f4189a 100644
--- a/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
@@ -70,7 +70,7 @@ int EvolveProblemBDF(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "CVodeSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/raja/ida_driver.cpp b/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
index 3ae28a43ca..792e805365 100644
--- a/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
@@ -92,7 +92,7 @@ int EvolveDAEProblem(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "IDASetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/diffusion_2D/main_arkode.cpp b/benchmarks/diffusion_2D/main_arkode.cpp
index ba1c7bd68d..d6c9eaefd4 100644
--- a/benchmarks/diffusion_2D/main_arkode.cpp
+++ b/benchmarks/diffusion_2D/main_arkode.cpp
@@ -177,7 +177,7 @@ int main(int argc, char* argv[])
     sunindextype* A_row_ptrs = nullptr;
 #endif
 
-    int prectype = (uopts.preconditioning) ? PREC_RIGHT : PREC_NONE;
+    int prectype = (uopts.preconditioning) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
     if (uopts.ls == "cg")
     {
diff --git a/benchmarks/diffusion_2D/main_cvode.cpp b/benchmarks/diffusion_2D/main_cvode.cpp
index 92ba352f2f..285a45ecd1 100644
--- a/benchmarks/diffusion_2D/main_cvode.cpp
+++ b/benchmarks/diffusion_2D/main_cvode.cpp
@@ -172,7 +172,7 @@ int main(int argc, char* argv[])
     sunindextype* A_row_ptrs = nullptr;
 #endif
 
-    int prectype = (uopts.preconditioning) ? PREC_RIGHT : PREC_NONE;
+    int prectype = (uopts.preconditioning) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
     if (uopts.ls == "cg")
     {
diff --git a/benchmarks/diffusion_2D/main_ida.cpp b/benchmarks/diffusion_2D/main_ida.cpp
index 6fb5d01b3e..46cf86d84c 100644
--- a/benchmarks/diffusion_2D/main_ida.cpp
+++ b/benchmarks/diffusion_2D/main_ida.cpp
@@ -176,7 +176,7 @@ int main(int argc, char* argv[])
     sunindextype* A_row_ptrs = nullptr;
 #endif
 
-    int prectype = (uopts.preconditioning) ? PREC_RIGHT : PREC_NONE;
+    int prectype = (uopts.preconditioning) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
     if (uopts.ls == "cg")
     {
diff --git a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
index 06ccccb4cc..64445583a5 100644
--- a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
+++ b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
@@ -495,7 +495,7 @@ static int SetupLS(N_Vector u, void *user_data, SUNContext sunctx)
   // Access problem data
   UserData *udata = (UserData *) user_data;
 
-  int prectype = PREC_RIGHT;
+  int prectype = SUN_PREC_RIGHT;
 
   // Create linear solver
   udata->LS = SUNLinSol_PCG(u, prectype, udata->liniters, sunctx);
diff --git a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
index 7a85c6b8d0..1c0f12a76c 100644
--- a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
+++ b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
@@ -688,7 +688,7 @@ static int SetupLS(N_Vector u, void *user_data, SUNContext sunctx)
   // Access problem data
   UserData *udata = (UserData *) user_data;
 
-  int prectype = PREC_RIGHT;
+  int prectype = SUN_PREC_RIGHT;
 
   // Create linear solver
   udata->LS = SUNLinSol_PCG(u, prectype, udata->liniters, sunctx);