diff --git a/sensors/main.py b/sensors/main.py
index d332359..2134068 100644
--- a/sensors/main.py
+++ b/sensors/main.py
@@ -449,9 +449,7 @@ def read_as3935(c):
         write(c, 'lightning', {
             'lightning_distance':          dist,
             'lightning_energy':               energy,
-            'lightning_detector_sensitivity': c['AS3935_NOISE_FLOOR'],
-            'lightning_false_positive':       1 if interrupt == 0x04 else 0,
-            'lightning_strikes_per_hour':     strike_rate,
+            'lightning_rate':     strike_rate,
         }, tags={'storm_direction': trend})
     except Exception as e:
         print(f"[AS3935] {e}")
@@ -498,8 +496,7 @@ def read_rain(c):
     try:
         write(c, 'rain', {
             'precipitation':   0,
-            'raining':         False,
-        })
+        }, tags={'raining': False})
     except Exception as e:
         print(f"[Rain] {e}")