diff --git a/bilby/gw/prior_files/GW150914.prior b/bilby/gw/prior_files/GW150914.prior
index b46e182fb8d136d70786d600dda574b838ee4bb4..2a48c390735e58f9c11ece2429842796aac7d23c 100644
--- a/bilby/gw/prior_files/GW150914.prior
+++ b/bilby/gw/prior_files/GW150914.prior
@@ -1,16 +1,16 @@
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=31)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=25, maximum=31)
 mass_1 = Constraint(name='mass_1', minimum=10, maximum=80)
 mass_2 = Constraint(name='mass_2', minimum=10, maximum=80)
 a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
 a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
-tilt_1 = Sine(name='tilt_1', boundary='reflective')
-tilt_2 = Sine(name='tilt_2', boundary='reflective')
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
 phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
 phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
 luminosity_distance = PowerLaw(alpha=2, name='luminosity_distance', minimum=50, maximum=2000, unit='Mpc', latex_label='$d_L$')
 dec =  Cosine(name='dec')
 ra =  Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
-theta_jn =  Sine(name='theta_jn', boundary='reflective')
+theta_jn =  Sine(name='theta_jn')
 psi =  Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase =  Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/GW170817.prior b/bilby/gw/prior_files/GW170817.prior
index a508e40079d24536510779d1cc2e811d4fce36d6..9eed90a205a8d4df3acb8f55900e098dd1afdac4 100644
--- a/bilby/gw/prior_files/GW170817.prior
+++ b/bilby/gw/prior_files/GW170817.prior
@@ -1,8 +1,8 @@
 # Example of priors for GW170817
 # mass_1 = Constraint(name='mass_1', minimum=1.2, maximum=1.99)
 # mass_2 = Constraint(name='mass_2', minimum=1., maximum=1.4)
-chirp_mass = Uniform(name='chirp_mass', minimum=0.87, maximum=1.74, unit='$M_{\odot}$', boundary=None)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1.0, boundary=None)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=1.197, maximum=1.198, unit='$M_{\odot}$', boundary=None)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1.0, boundary=None)
 a_1 = Uniform(name='a_1', minimum=0, maximum=0.05)
 a_2 = Uniform(name='a_2', minimum=0, maximum=0.05)
 tilt_1 = Sine(name='tilt_1')
@@ -15,7 +15,7 @@ ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
 theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
-# lambda_1 = Constraint(name='lambda_1', minimum=0, maximum=5000)
-# lambda_2 = Constraint(name='lambda_2', minimum=0, maximum=5000)
+lambda_1 = Constraint(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Constraint(name='lambda_2', minimum=0, maximum=5000)
 lambda_tilde = Uniform(name='lambda_tilde', minimum=0, maximum=1000, boundary=None)
 delta_lambda_tilde = Uniform(name='delta_lambda_tilde', minimum=-5000, maximum=5000, boundary=None)
diff --git a/bilby/gw/prior_files/aligned_spins_bbh.prior b/bilby/gw/prior_files/aligned_spins_bbh.prior
index 4a15f7a3a14f85ee65385d6ca30263ed7c5c6ca9..5beb84590655d5005e3357daf54b0469b26c6c1f 100644
--- a/bilby/gw/prior_files/aligned_spins_bbh.prior
+++ b/bilby/gw/prior_files/aligned_spins_bbh.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
 mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=25, maximum=100)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior b/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior
index 4fc71953eacb34b364e6a55b6a3d521ee7609b81..9b812265095df0c21e487707ef3d0b9065e332b6 100644
--- a/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior
+++ b/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
 mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=25, maximum=100)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/aligned_spins_bns.prior b/bilby/gw/prior_files/aligned_spins_bns.prior
index a524de77759b93fbaa7772b17fce573d35be69bd..e2aef815d7c6575065cf24c803060b0583209e06 100644
--- a/bilby/gw/prior_files/aligned_spins_bns.prior
+++ b/bilby/gw/prior_files/aligned_spins_bns.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=0.5, maximum=5)
 mass_2 = Constraint(name='mass_2', minimum=0.5, maximum=5)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=0.4, maximum=4.4)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=0.4, maximum=4.4)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior b/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior
index dcb30189b9c2867f35c98f8c9580b62c491d3dd4..53ffdfa74f672f82fdb30da8450de50606a9f1c5 100644
--- a/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior
+++ b/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=0.5, maximum=5)
 mass_2 = Constraint(name='mass_2', minimum=0.5, maximum=5)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=0.4, maximum=4.4)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=0.4, maximum=4.4)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/precessing_spins_bbh.prior b/bilby/gw/prior_files/precessing_spins_bbh.prior
index 27094d689666e2a6e195e36f4b795c9feb3347c3..e39b5f472c0ee0b08b4096464ae60876ded7c3c3 100644
--- a/bilby/gw/prior_files/precessing_spins_bbh.prior
+++ b/bilby/gw/prior_files/precessing_spins_bbh.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
 mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=25, maximum=100)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior b/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior
index 81da0482f26708a1cf5cb5d11fdd61f6fc2654b4..4e4bc2e0efd35ee68549ff6d12b78e075a95dfc1 100644
--- a/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior
+++ b/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
 mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=25, maximum=100)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/precessing_spins_bns.prior b/bilby/gw/prior_files/precessing_spins_bns.prior
index cb663dbbe1eb90badc3dcb066ecef85863a26801..cddc4dbeb76857771566a8f1404a640074424111 100644
--- a/bilby/gw/prior_files/precessing_spins_bns.prior
+++ b/bilby/gw/prior_files/precessing_spins_bns.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=0.5, maximum=5)
 mass_2 = Constraint(name='mass_2', minimum=0.5, maximum=5)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=0.4, maximum=4.4)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=0.4, maximum=4.4)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
diff --git a/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior b/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior
index d0c7e875c7d9ab8ad9dfd0fb1b41dc2562d43855..aeaf8a147aa8ee055ea73d269f51e629e0dddd12 100644
--- a/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior
+++ b/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior
@@ -4,8 +4,8 @@
 # Lines beginning "#" are ignored.
 mass_1 = Constraint(name='mass_1', minimum=0.5, maximum=5)
 mass_2 = Constraint(name='mass_2', minimum=0.5, maximum=5)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
-chirp_mass = Uniform(name='chirp_mass', minimum=0.4, maximum=4.4)
+mass_ratio = bilby.gw.prior.UniformInComponentsMassRatio(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = bilby.gw.prior.UniformInComponentsChirpMass(name='chirp_mass', minimum=0.4, maximum=4.4)
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')