diff --git a/Source/driver/runtime_parameters.H b/Source/driver/runtime_parameters.H
index 0619070811..4881668f2b 100644
--- a/Source/driver/runtime_parameters.H
+++ b/Source/driver/runtime_parameters.H
@@ -1,6 +1,7 @@
 #ifndef RUNTIME_PARAMETERS_H
 #define RUNTIME_PARAMETERS_H
 
+#include <AMReX_Print.H>
 #include <AMReX_ParmParse.H>
 #include <castro_limits.H>
 
@@ -25,34 +26,34 @@ initialize_cpp_runparams()
 {
 
     {
-        ParmParse pp("castro");
+        amrex::ParmParse pp("castro");
 #include <castro_queries.H>
     }
 
 #ifdef AMREX_PARTICLES
     {
-        ParmParse pp("particles");
+        amrex::ParmParse pp("particles");
 #include <particles_queries.H>
     }
 #endif
 
 #ifdef DIFFUSION
     {
-        ParmParse pp("diffusion");
+        amrex::ParmParse pp("diffusion");
 #include <diffusion_queries.H>
     }
 #endif
 
 #ifdef GRAVITY
     {
-        ParmParse pp("gravity");
+        amrex::ParmParse pp("gravity");
 #include <gravity_queries.H>
     }
 #endif
 
 #ifdef RADIATION
     {
-        ParmParse pp("radiation");
+        amrex::ParmParse pp("radiation");
 #include <radiation_queries.H>
     }
 #endif
@@ -102,14 +103,14 @@ validate_runparams()
     for (const auto& nm: check_namespaces)
     {
         // "castro"
-        if (ParmParse::hasUnusedInputs(nm)) {
+        if (amrex::ParmParse::hasUnusedInputs(nm)) {
             amrex::Print() << "Warning: the following " + nm + ".* parameters are ignored\n";
-            auto unused = ParmParse::getUnusedInputs(nm);
+            auto unused = amrex::ParmParse::getUnusedInputs(nm);
             for (const auto& p: unused) {
                 amrex::Print() << p << "\n";
             }
             amrex::Print() << std::endl;
-            if (abort_on_invalid_params) {
+            if (castro::abort_on_invalid_params) {
                 amrex::Error("Error: invalid parameters");
             }
         }