diff --git a/config.yaml b/config.yaml
index 315a2498..9284fb25 100644
--- a/config.yaml
+++ b/config.yaml
@@ -243,7 +243,7 @@ PHONE_KEYBOARD:
 
 # See https://www.rapids.science/latest/features/phone-light/
 PHONE_LIGHT:
-  CONTAINER: light
+  CONTAINER: light_sensor
   PROVIDERS:
     RAPIDS:
       COMPUTE: True
diff --git a/data/external/timesegments_daily.csv b/data/external/timesegments_daily.csv
index 623cf9be..654de8cd 100644
--- a/data/external/timesegments_daily.csv
+++ b/data/external/timesegments_daily.csv
@@ -1,2 +1,2 @@
 label,start_time,length,repeats_on,repeats_value
-daily, 03:59:59,23H 59M 59S, wday, 1-5
+daily,03:59:59,23H 59M 59S,every_day,0
diff --git a/src/data/streams/aware_postgresql/format.yaml b/src/data/streams/aware_postgresql/format.yaml
index bc866f83..a6bf17c1 100644
--- a/src/data/streams/aware_postgresql/format.yaml
+++ b/src/data/streams/aware_postgresql/format.yaml
@@ -66,8 +66,7 @@ PHONE_APPLICATIONS_FOREGROUND:
     RAPIDS_COLUMN_MAPPINGS:
       TIMESTAMP: timestamp
       DEVICE_ID: device_id
-      PACKAGE_NAME: package_name
-      APPLICATION_NAME: application_name
+      PACKAGE_NAME: package_hash
       IS_SYSTEM_APP: is_system_app
     MUTATION:
       COLUMN_MAPPINGS:
@@ -78,13 +77,9 @@ PHONE_APPLICATIONS_NOTIFICATIONS:
     RAPIDS_COLUMN_MAPPINGS:
       TIMESTAMP: timestamp
       DEVICE_ID: device_id
-      PACKAGE_NAME: package_name
-      APPLICATION_NAME: application_name
-      TEXT: text
+      PACKAGE_NAME: package_hash
       SOUND: sound
       VIBRATE: vibrate
-      DEFAULTS: defaults
-      FLAGS: flags
     MUTATION:
       COLUMN_MAPPINGS:
       SCRIPTS: # List any python or r scripts that mutate your raw data
diff --git a/src/data/streams/rapids_columns.yaml b/src/data/streams/rapids_columns.yaml
index e1aff997..40ecc98c 100644
--- a/src/data/streams/rapids_columns.yaml
+++ b/src/data/streams/rapids_columns.yaml
@@ -27,19 +27,14 @@ PHONE_APPLICATIONS_FOREGROUND:
   - TIMESTAMP
   - DEVICE_ID
   - PACKAGE_NAME
-  - APPLICATION_NAME
   - IS_SYSTEM_APP
 
 PHONE_APPLICATIONS_NOTIFICATIONS:
   - TIMESTAMP
   - DEVICE_ID
   - PACKAGE_NAME
-  - APPLICATION_NAME
-  - TEXT
   - SOUND
   - VIBRATE
-  - DEFAULTS
-  - FLAGS
 
 PHONE_BATTERY:
   - TIMESTAMP