diff --git a/Util/exact_riemann/Make.package b/Util/exact_riemann/Make.package
index 4916ffc34c..8e4f2a074e 100644
--- a/Util/exact_riemann/Make.package
+++ b/Util/exact_riemann/Make.package
@@ -1,8 +1,10 @@
 CEXE_sources += main.cpp
 
 CEXE_headers += exact_riemann.H
-CEXE_headers += riemann_star_state.H
-CEXE_headers += riemann_sample.H
+CEXE_headers += exact_riemann_star_state.H
+CEXE_headers += exact_riemann_sample.H
+CEXE_headers += exact_riemann_shock.H
+CEXE_headers += exact_riemann_rarefaction.H
 CEXE_sources += extern_parameters.cpp
 CEXE_headers += extern_parameters.H
 
diff --git a/Util/exact_riemann/exact_riemann.H b/Util/exact_riemann/exact_riemann.H
index 82dec000ad..b1cf14e832 100644
--- a/Util/exact_riemann/exact_riemann.H
+++ b/Util/exact_riemann/exact_riemann.H
@@ -7,8 +7,8 @@
 
 #include <castro_params.H>
 
-#include <riemann_sample.H>
-#include <riemann_star_state.H>
+#include <exact_riemann_sample.H>
+#include <exact_riemann_star_state.H>
 
 using namespace amrex::literals;
 
diff --git a/Util/exact_riemann/riemann_rarefaction.H b/Util/exact_riemann/exact_riemann_rarefaction.H
similarity index 100%
rename from Util/exact_riemann/riemann_rarefaction.H
rename to Util/exact_riemann/exact_riemann_rarefaction.H
diff --git a/Util/exact_riemann/riemann_sample.H b/Util/exact_riemann/exact_riemann_sample.H
similarity index 99%
rename from Util/exact_riemann/riemann_sample.H
rename to Util/exact_riemann/exact_riemann_sample.H
index d123fd046b..c255ea1cce 100644
--- a/Util/exact_riemann/riemann_sample.H
+++ b/Util/exact_riemann/exact_riemann_sample.H
@@ -4,7 +4,7 @@
 #include <AMReX_REAL.H>
 
 #include <riemann_constants.H>
-#include <riemann_rarefaction.H>
+#include <exact_riemann_rarefaction.H>
 
 using namespace amrex::literals;
 
diff --git a/Util/exact_riemann/riemann_shock.H b/Util/exact_riemann/exact_riemann_shock.H
similarity index 100%
rename from Util/exact_riemann/riemann_shock.H
rename to Util/exact_riemann/exact_riemann_shock.H
diff --git a/Util/exact_riemann/riemann_star_state.H b/Util/exact_riemann/exact_riemann_star_state.H
similarity index 98%
rename from Util/exact_riemann/riemann_star_state.H
rename to Util/exact_riemann/exact_riemann_star_state.H
index b432a61d82..7a421c1512 100644
--- a/Util/exact_riemann/riemann_star_state.H
+++ b/Util/exact_riemann/exact_riemann_star_state.H
@@ -4,8 +4,8 @@
 #include <AMReX_REAL.H>
 
 #include <riemann_constants.H>
-#include <riemann_shock.H>
-#include <riemann_rarefaction.H>
+#include <exact_riemann_shock.H>
+#include <exact_riemann_rarefaction.H>
 
 using namespace amrex::literals;