diff --git a/Source/driver/Castro.H b/Source/driver/Castro.H
index 1c8b7725f8..5edfa811d3 100644
--- a/Source/driver/Castro.H
+++ b/Source/driver/Castro.H
@@ -1199,6 +1199,12 @@ public:
     static Vector<std::unique_ptr<std::fstream> > data_logs;
     static Vector<std::unique_ptr<std::fstream> > problem_data_logs;
 
+///
+/// runtime parameters
+//
+    static params_t params;
+
+
 protected:
 
 
@@ -1409,8 +1415,6 @@ protected:
     static int         lastDtPlotLimited;
     static amrex::Real lastDtBeforePlotLimiting;
 
-    static params_t params;
-
     int in_retry;
     int num_subcycles_taken;
 
diff --git a/Source/driver/Castro.cpp b/Source/driver/Castro.cpp
index 8c6724d621..7b10b86912 100644
--- a/Source/driver/Castro.cpp
+++ b/Source/driver/Castro.cpp
@@ -76,6 +76,8 @@ int          Castro::NUM_GROW_SRC  = -1;
 int          Castro::lastDtPlotLimited = 0;
 Real         Castro::lastDtBeforePlotLimiting = 0.0;
 
+params_t     Castro::params;
+
 Real         Castro::num_zones_advanced = 0.0;
 
 Vector<std::string> Castro::source_names;
diff --git a/Source/driver/parse_castro_params.py b/Source/driver/parse_castro_params.py
index 3fe6ac6799..aedeea6624 100755
--- a/Source/driver/parse_castro_params.py
+++ b/Source/driver/parse_castro_params.py
@@ -206,13 +206,15 @@ def write_headers(params, out_directory, struct_name):
             if ifdef is None:
                 for p in [q for q in params_nm if q.ifdef is None]:
                     cq.write(p.get_default_string())
-                    cq.write(p.get_query_string("C++"))
+                    cq.write(p.get_query_string())
+                    cq.write(p.get_query_struct_string(struct_name=struct_name, class_name="Castro"))
                     cq.write("\n")
             else:
                 cq.write(f"#ifdef {ifdef}\n")
                 for p in [q for q in params_nm if q.ifdef == ifdef]:
                     cq.write(p.get_default_string())
-                    cq.write(p.get_query_string("C++"))
+                    cq.write(p.get_query_string())
+                    cq.write(p.get_query_struct_string(struct_name=struct_name, class_name="Castro"))
                     cq.write("\n")
                 cq.write("#endif\n")
             cq.write("\n")
diff --git a/Util/scripts/write_probdata.py b/Util/scripts/write_probdata.py
index 2e44621cdc..68cb716aac 100755
--- a/Util/scripts/write_probdata.py
+++ b/Util/scripts/write_probdata.py
@@ -244,7 +244,7 @@ def write_probin(prob_param_files, cxx_prefix):
                 fout.write(f"        {p.get_default_string()}")
 
             if p.in_namelist:
-                fout.write(f"        {p.get_query_string('C++')}")
+                fout.write(f"        {p.get_query_string()}")
             fout.write("\n")
         fout.write("    }\n")