reflect thorn name change, also change implementation name, file, parameter and function names, make testsuites work by also applying the necessary name changes

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Hydro_InitExcision/trunk@106 55d78c69-0c5c-4738-8e60-d8a2776539f3

18 files changed, 198 insertions, 198 deletions

diff --git a/test/diag_flip_pugh_eno.par b/test/diag_flip_pugh_eno.par
index 39694b4..c602eda 100644
--- a/test/diag_flip_pugh_eno.par
+++ b/test/diag_flip_pugh_eno.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,16 +70,16 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip = 1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip = 1
diff --git a/test/diag_flip_pugh_ppm.par b/test/diag_flip_pugh_ppm.par
index 1128a7d..71fabcf 100644
--- a/test/diag_flip_pugh_ppm.par
+++ b/test/diag_flip_pugh_ppm.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,16 +70,16 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip = 1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip = 1
diff --git a/test/diag_flip_pugh_tvd.par b/test/diag_flip_pugh_tvd.par
index 280096c..7ebb09b 100644
--- a/test/diag_flip_pugh_tvd.par
+++ b/test/diag_flip_pugh_tvd.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -71,16 +71,16 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip = 1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip = 1
diff --git a/test/diag_pugh_eno.par b/test/diag_pugh_eno.par
index b2eb83a..58f16f5 100644
--- a/test/diag_pugh_eno.par
+++ b/test/diag_pugh_eno.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,14 +70,14 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/diag_pugh_ppm.par b/test/diag_pugh_ppm.par
index 7a0ef2c..8cc419f 100644
--- a/test/diag_pugh_ppm.par
+++ b/test/diag_pugh_ppm.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,14 +70,14 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/diag_pugh_tvd.par b/test/diag_pugh_tvd.par
index 18ca257..a2c2a81 100644
--- a/test/diag_pugh_tvd.par
+++ b/test/diag_pugh_tvd.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -71,14 +71,14 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/halfsphere_pugh_eno.par b/test/halfsphere_pugh_eno.par
index 228b8a7..8cfac12 100644
--- a/test/halfsphere_pugh_eno.par
+++ b/test/halfsphere_pugh_eno.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.5
-whisky_initexcision::whisky_initexcision_position_x=9.5
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.5
+hydro_initexcision::hydro_initexcision_position_x=9.5
diff --git a/test/halfsphere_pugh_ppm.par b/test/halfsphere_pugh_ppm.par
index 2313e06..04d114c 100644
--- a/test/halfsphere_pugh_ppm.par
+++ b/test/halfsphere_pugh_ppm.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.5
-whisky_initexcision::whisky_initexcision_position_x=9.5
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.5
+hydro_initexcision::hydro_initexcision_position_x=9.5
diff --git a/test/halfsphere_pugh_tvd.par b/test/halfsphere_pugh_tvd.par
index 64627f6..b7d2ef0 100644
--- a/test/halfsphere_pugh_tvd.par
+++ b/test/halfsphere_pugh_tvd.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -75,15 +75,15 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.5
-whisky_initexcision::whisky_initexcision_position_x=9.5
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.5
+hydro_initexcision::hydro_initexcision_position_x=9.5
diff --git a/test/sphere_pugh_eno.par b/test/sphere_pugh_eno.par
index badb53c..c596513 100644
--- a/test/sphere_pugh_eno.par
+++ b/test/sphere_pugh_eno.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::shock_xpos          = -5.
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::shock_xpos          = -5.
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/sphere_pugh_ppm.par b/test/sphere_pugh_ppm.par
index e3732b1..98e7e15 100644
--- a/test/sphere_pugh_ppm.par
+++ b/test/sphere_pugh_ppm.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::shock_xpos          = -5.
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::shock_xpos          = -5.
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/sphere_pugh_tvd.par b/test/sphere_pugh_tvd.par
index 98b4e98..7dafbae 100644
--- a/test/sphere_pugh_tvd.par
+++ b/test/sphere_pugh_tvd.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -75,15 +75,15 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::shock_xpos          = -5.
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::shock_xpos          = -5.
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/x_flip_pugh_eno.par b/test/x_flip_pugh_eno.par
index 2c2ecfc..d942f0d 100644
--- a/test/x_flip_pugh_eno.par
+++ b/test/x_flip_pugh_eno.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,16 +69,16 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip    =1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip    =1
diff --git a/test/x_flip_pugh_ppm.par b/test/x_flip_pugh_ppm.par
index 776ca20..7d05f0e 100644
--- a/test/x_flip_pugh_ppm.par
+++ b/test/x_flip_pugh_ppm.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,16 +69,16 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip    =1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip    =1
diff --git a/test/x_flip_pugh_tvd.par b/test/x_flip_pugh_tvd.par
index 167b515..124b366 100644
--- a/test/x_flip_pugh_tvd.par
+++ b/test/x_flip_pugh_tvd.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,16 +70,16 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip    =1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip    =1
diff --git a/test/x_pugh_eno.par b/test/x_pugh_eno.par
index e80ba03..a8c46e3 100644
--- a/test/x_pugh_eno.par
+++ b/test/x_pugh_eno.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,14 +69,14 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/x_pugh_ppm.par b/test/x_pugh_ppm.par
index dbc742e..c0f4872 100644
--- a/test/x_pugh_ppm.par
+++ b/test/x_pugh_ppm.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,14 +69,14 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/x_pugh_tvd.par b/test/x_pugh_tvd.par
index df07a43..02614a4 100644
--- a/test/x_pugh_tvd.par
+++ b/test/x_pugh_tvd.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,14 +70,14 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.25