diff --git a/src/main/assets/acl/bypass-china.acl b/src/main/assets/acl/bypass-china.acl
index 8a29dca1..66436872 100644
--- a/src/main/assets/acl/bypass-china.acl
+++ b/src/main/assets/acl/bypass-china.acl
@@ -1,6 +1,6 @@
 [proxy_all]
 
-[black_list]
+[bypass_list]
 1.0.1.0/24
 1.0.2.0/23
 1.0.8.0/21
@@ -4756,8 +4756,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis\.com$
+^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/bypass-lan-china.acl b/src/main/assets/acl/bypass-lan-china.acl
index 16ee2819..ac3e14b9 100644
--- a/src/main/assets/acl/bypass-lan-china.acl
+++ b/src/main/assets/acl/bypass-lan-china.acl
@@ -1,6 +1,6 @@
 [proxy_all]
 
-[black_list]
+[bypass_list]
 0.0.0.0/8
 10.0.0.0/8
 100.64.0.0/10
@@ -4438,7 +4438,7 @@
 223.255.236.0/22
 223.255.252.0/23
 
-[white_list]
+[proxy_list]
 ^(.*\.)?4tern\.com$
 ^(.*\.)?adorama\.com$
 ^(.*\.)?akiba-web\.com$
@@ -4770,8 +4770,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis\.com$
+^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$
diff --git a/src/main/assets/acl/china-list.acl b/src/main/assets/acl/china-list.acl
index 03dc31fd..2fcc2066 100644
--- a/src/main/assets/acl/china-list.acl
+++ b/src/main/assets/acl/china-list.acl
@@ -1,6 +1,6 @@
 [bypass_all]
 
-[white_list]
+[proxy_list]
 1.0.1.0/24
 1.0.2.0/23
 1.0.8.0/21
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
index bada7f58..8939b57e 100644
--- a/src/main/assets/acl/gfwlist.acl
+++ b/src/main/assets/acl/gfwlist.acl
@@ -2,7 +2,7 @@
 # updated on 2016-09-08 12:09:55$
 [bypass_all]
 
-[white_list]
+[proxy_list]
 # Telegram IPs$
 91.108.4.0/22
 91.108.56.0/22
@@ -339,8 +339,8 @@
 ^(.*\.)?gmail\.com$
 ^(.*\.)?gmodules\.com$
 ^(.*\.)?goo\.gl$
-^(.*\.)?google(\..*)?$
-^(.*\.)?googleapis\.com$
+^(.*\.)?google(\.[^.]{2,4}){1,2}$
+^(.*\.)?googleapis(\.[^.]{2,4}){1,2}$
 ^(.*\.)?googleapps\.com$
 ^(.*\.)?googleartproject\.com$
 ^(.*\.)?googleblog\.com$