diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index ee2f343..5f27dfc 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -112,7 +112,7 @@
 static bool enable_pressure_upgrade;
 static int64_t upgrade_pressure;
 static int64_t downgrade_pressure;
-static bool is_go_device;
+static bool low_ram_device;
 static bool kill_heaviest_task;
 static unsigned long kill_timeout_ms;
 
@@ -771,7 +771,7 @@
         struct proc *procp;
 
         while (true) {
-            if (is_go_device)
+            if (low_ram_device)
                 procp = proc_adj_lru(i);
             else
                 procp = proc_get_heaviest(i);
@@ -962,7 +962,7 @@
     }
 
 do_kill:
-    if (is_go_device) {
+    if (low_ram_device) {
         /* For Go devices kill only one task */
         if (find_and_kill_processes(level, 0) == 0) {
             if (debug_process_killing) {
@@ -1199,7 +1199,7 @@
         (int64_t)property_get_int32("ro.lmk.downgrade_pressure", 100);
     kill_heaviest_task =
         property_get_bool("ro.lmk.kill_heaviest_task", true);
-    is_go_device = property_get_bool("ro.config.low_ram", false);
+    low_ram_device = property_get_bool("ro.config.low_ram", false);
     kill_timeout_ms =
         (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);
 
