diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd8ba5c3f..d9d64f845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+- Reduce Autofill false positives on username fields by removing "name" from list of heuristic terms
+
 ## [1.8.1] - 2020-05-24
 
 ### Fixed
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
index beb9b6121..0c96b587e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
@@ -83,7 +83,7 @@ class FormField(
             "pass", "pswd", "pwd"
         )
         private val USERNAME_HEURISTIC_TERMS = listOf(
-            "alias", "e-mail", "email", "login", "name", "user"
+            "alias", "e-mail", "email", "login", "user"
         )
     }