diff --git a/host.d/config.d/mayhem-party.d/env.env b/host.d/config.d/mayhem-party.d/env.env
index df92c5a..8790792 100644
--- a/host.d/config.d/mayhem-party.d/env.env
+++ b/host.d/config.d/mayhem-party.d/env.env
@@ -1,6 +1,6 @@
 export DEBUG=1
-export INPUT_UDP=17070
-export INPUT_REFRESH_ON_SIGUSR1=true
-export INPUT_REMAP_FILE=./config.d/mayhem-party.d/remap.d/live.yaml
+export RAW_UDP=17070
+export WRAP_REFRESH_ON_SIGUSR1=true
+export WRAP_REMAP_FILE=./config.d/mayhem-party.d/remap.d/live.yaml
 export MAIN_INTERVAL_DURATION=5ms
 export OUTPUT_KEYBOARD=false
diff --git a/testdata/keyboard_input.env b/testdata/keyboard_input.env
index 069b56f..769839e 100644
--- a/testdata/keyboard_input.env
+++ b/testdata/keyboard_input.env
@@ -1,2 +1,2 @@
-export INPUT_BUFFERED=true
-export INPUT_KEYBOARD=true
+export WRAP_BUFFERED=true
+export RAW_KEYBOARD=true
diff --git a/testdata/remapped_wasd.env b/testdata/remapped_wasd.env
index 4e3a813..9145025 100644
--- a/testdata/remapped_wasd.env
+++ b/testdata/remapped_wasd.env
@@ -1,2 +1,2 @@
-export INPUT_RANDOM_WEIGHT_FILE=testdata/INPUT_RANDOM_WEIGHT_FILE.yaml
-export INPUT_REMAP_FILE=testdata/INPUT_REMAP_FILE.yaml
+export RAW_RANDOM_WEIGHT_FILE=testdata/INPUT_RANDOM_WEIGHT_FILE.yaml
+export WRAP_REMAP_FILE=testdata/INPUT_REMAP_FILE.yaml
diff --git a/testdata/supermarioplay.com.env b/testdata/supermarioplay.com.env
index 409a4bc..cb78063 100644
--- a/testdata/supermarioplay.com.env
+++ b/testdata/supermarioplay.com.env
@@ -1,3 +1,3 @@
 export OUTPUT_KEYBOARD=true
 export MAIN_INTERVAL_DURATION=250ms
-export INPUT_RANDOM_WEIGHT_FILE=testdata/INPUT_RANDOM_WEIGHT_FILE.yaml
+export RAW_RANDOM_WEIGHT_FILE=testdata/INPUT_RANDOM_WEIGHT_FILE.yaml