diff --git a/51-android.rules b/51-android.rules
index 2095990..abf432b 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -236,8 +236,8 @@ ATTR{idVendor}=="109b", ENV{adb_user}="yes"
 # Honeywell/Foxconn
 ATTR{idVendor}!="0c2e", GOTO="not_Honeywell"
 #   D70e
-ATTR{idProduct}=="0ba3", ENV{adb_adb}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="0ba3", GOTO="go_adb"
+GOTO="android_usb_rules_end"
 LABEL="not_Honeywell"
 
 # HTC
@@ -326,23 +326,23 @@ LABEL="not_Huawei"
 # Intel
 ATTR{idVendor}!="8087", GOTO="not_Intel"
 #   Geeksphone Revolution
-ATTR{idProduct}=="0a16", ENV{adb_adb}="yes"
+ATTR{idProduct}=="0a16", GOTO="go_adb"
 #   Chuwi Hi 10 Pro (HQ64)
-ATTR{idProduct}=="2a65", ENV{adb_adb}="yes"
-ATTR{idProduct}=="07ef", ENV{adb_adb}="yes"
+ATTR{idProduct}=="2a65", GOTO="go_adb"
+ATTR{idProduct}=="07ef", GOTO="go_adb"
 #   Asus ZenFone 2 (ADB Sideload in TWRP Recovery)
-ATTR{idProduct}=="0a5d", ENV{adb_adb}="yes"
+ATTR{idProduct}=="0a5d", GOTO="go_adb"
 #   Reference Boards using kernelflinger
 #   See https://github.com/intel/kernelflinger/blob/master/libefiusb/usb.c#L56
-ATTR{idProduct}=="09ef", ENV{adb_adbfast}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="09ef", GOTO="go_adbfast"
+GOTO="android_usb_rules_end"
 LABEL="not_Intel"
 
 # IUNI
 ATTR{idVendor}!="271d", GOTO="not_IUNI"
 #   U3
-ATTR{idProduct}=="bf39", ENV{adb_adb}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="bf39", GOTO="go_adb"
+GOTO="android_usb_rules_end"
 LABEL="not_IUNI"
 
 # K-Touch
@@ -399,19 +399,19 @@ LABEL="not_LG"
 # Meizu
 ATTR{idVendor}!="2a45", GOTO="not_Meizu"
 #   M1E
-ATTR{idProduct}=="0c01", ENV{adb_adb}="yes"
+ATTR{idProduct}=="0c01", GOTO="go_adb"
 #   MX6
-ATTR{idProduct}=="0c02", ENV{adb_adb}="yes"
-#   M6T (untested; See <https://github.com/M0Rf30/android-udev-rules/issues/262>
-ATTR{idProduct}=="201c", ENV{adb_adb}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="0c02", GOTO="go_adb"
+#   M6T (untested: See <https://github.com/M0Rf30/android-udev-rules/issues/262> )
+ATTR{idProduct}=="201c", GOTO="go_adb"
+GOTO="android_usb_rules_end"
 LABEL="not_Meizu"
 
 # Micromax
 ATTR{idVendor}!="2a96", GOTO="not_Micromax"
 #   P702
-ATTR{idProduct}=="201d", ENV{adb_adbfast}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="201d", GOTO="go_adbfast"
+GOTO="android_usb_rules_end"
 LABEL="not_Micromax"
 
 # Microsoft