diff --git a/flamedisx/lz/lz_WS2024.py b/flamedisx/lz/lz_WS2024.py
index 7abda451..651b83a5 100644
--- a/flamedisx/lz/lz_WS2024.py
+++ b/flamedisx/lz/lz_WS2024.py
@@ -558,7 +558,7 @@ def variance(self, *args):
 
 
 @export
-class LZCH3TSource(LZWS2024Source, fd.nest.CH3TSource):
+class LZ24CH3TSource(LZ24ERSource, fd.nest.CH3TSource):
     t_start = pd.to_datetime('2022-04-19T00:00:00')
     t_start = t_start.tz_localize(tz='America/Denver')
 
@@ -570,13 +570,9 @@ def __init__(self, *args, **kwargs):
             kwargs['detector'] = 'lz_WS2024'
         super().__init__(*args, **kwargs)
 
-    @staticmethod
-    def get_elife(event_time):
-        return 6600000.
-
 
 @export
-class LZDDSource(LZWS2024Source, fd.nest.DDSource):
+class LZ24DDSource(LZ24NRSource, fd.nest.DDSource):
     t_start = pd.to_datetime('2022-04-19T00:00:00')
     t_start = t_start.tz_localize(tz='America/Denver')
 
@@ -588,10 +584,6 @@ def __init__(self, *args, **kwargs):
             kwargs['detector'] = 'lz_WS2024'
         super().__init__(*args, **kwargs)
 
-    @staticmethod
-    def get_elife(event_time):
-        return 6600000.
-
 
 ##
 # Signal sources
@@ -599,7 +591,7 @@ def get_elife(event_time):
 
 
 @export
-class LZWIMPSource(LZWS2024Source, fd.nest.nestWIMPSource):
+class LZWIMPSource(LZ24NRSource, fd.nest.nestWIMPSource):
     def __init__(self, *args, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -607,7 +599,7 @@ def __init__(self, *args, **kwargs):
 
 
 @export
-class LZFermionicDMSource(LZWS2024Source, fd.nest.FermionicDMSource):
+class LZ24FermionicDMSource(LZ24ERSource, fd.nest.FermionicDMSource):
     def __init__(self, *args, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -620,7 +612,7 @@ def __init__(self, *args, **kwargs):
 
 
 @export
-class LZPb214Source(LZWS2024Source, fd.nest.Pb214Source, fd.nest.nestSpatialRateERSource):
+class LZ24Pb214Source(LZ24ERSource, fd.nest.Pb214Source, fd.nest.nestSpatialRateERSource):
     def __init__(self, *args, bins=None, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -636,7 +628,7 @@ def __init__(self, *args, bins=None, **kwargs):
 
 
 @export
-class LZDetERSource(LZWS2024Source, fd.nest.DetERSource, fd.nest.nestSpatialRateERSource):
+class LZ24DetERSource(LZ24ERSource, fd.nest.DetERSource, fd.nest.nestSpatialRateERSource):
     def __init__(self, *args, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -648,7 +640,7 @@ def __init__(self, *args, **kwargs):
 
 
 @export
-class LZBetaSource(LZWS2024Source, fd.nest.BetaSource):
+class LZ24BetaSource(LZ24ERSource, fd.nest.BetaSource):
     def __init__(self, *args, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -656,7 +648,7 @@ def __init__(self, *args, **kwargs):
 
 
 @export
-class LZXe136Source(LZWS2024Source, fd.nest.Xe136Source):
+class LZ24Xe136Source(LZ24ERSource, fd.nest.Xe136Source):
     def __init__(self, *args, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -664,7 +656,7 @@ def __init__(self, *args, **kwargs):
 
 
 @export
-class LZvERSource(LZWS2024Source, fd.nest.vERSource, fd.nest.nestTemporalRateOscillationERSource):
+class LZ24vERSource(LZ24ERSource, fd.nest.vERSource, fd.nest.nestTemporalRateOscillationERSource):
     def __init__(self, *args, amplitude=None, phase_ns=None, period_ns=None, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -688,7 +680,7 @@ def __init__(self, *args, amplitude=None, phase_ns=None, period_ns=None, **kwarg
 
 
 @export
-class LZAr37Source(LZWS2024Source, fd.nest.Ar37Source, fd.nest.nestTemporalRateDecayERSource):
+class LZ24Ar37Source(LZ24ERSource, fd.nest.Ar37Source, fd.nest.nestTemporalRateDecayERSource):
     def __init__(self, *args, time_constant_ns=None, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -731,7 +723,7 @@ def __init__(self, *args, bins=None, time_constant_ns=None, **kwargs):
 
 
 @export
-class LZB8Source(LZWS2024Source, fd.nest.B8Source, fd.nest.nestTemporalRateOscillationNRSource):
+class LZ24B8Source(LZ24NRSource, fd.nest.B8Source, fd.nest.nestTemporalRateOscillationNRSource):
     def __init__(self, *args, amplitude=None, phase_ns=None, period_ns=None, **kwargs):
         if ('detector' not in kwargs):
             kwargs['detector'] = 'lz_WS2024'
@@ -755,7 +747,7 @@ def __init__(self, *args, amplitude=None, phase_ns=None, period_ns=None, **kwarg
 
 
 @export
-class LZDetNRSource(LZWS2024Source, fd.nest.nestSpatialRateNRSource):
+class LZ24DetNRSource(LZ24NRSource, fd.nest.nestSpatialRateNRSource):
     """
     """