diff --git a/Documentation/user-search-groups.txt b/Documentation/user-search-groups.txt
index 3de3cba..3d8c51c 100644
--- a/Documentation/user-search-groups.txt
+++ b/Documentation/user-search-groups.txt
@@ -37,8 +37,8 @@
 (case-insensitive).
 
 [[is]]
-[[is-visibleToAll]]
-is:visibleToAll::
+[[is-visibletoall]]
+is:visibletoall::
 +
 Matches groups that are in the groups options marked as visible to all
 registered users.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/Index.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/Index.java
index a1c9471c..5a8978a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/Index.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/Index.java
@@ -52,7 +52,7 @@
           .format("External Group Not Allowed: %s", rsrc.getGroupUUID().get()));
     }
 
-    // evicting the group from the cache, reindexes the account
+    // evicting the group from the cache, reindexes the group
     groupCache.evict(group);
     return Response.none();
   }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java
index f22a8c1..6c0ab86 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java
@@ -62,7 +62,7 @@
         }
       };
 
-  /** Fuzzy prefix match on group name parts. */
+  /** Prefix match on group name parts. */
   public static final FieldDef<AccountGroup, Iterable<String>> NAME_PART =
       new FieldDef.Repeatable<AccountGroup, String>(
           "name_part", FieldType.PREFIX, false) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java
index aa979f8..9105b99 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java
@@ -77,7 +77,7 @@
 
   @Operator
   public Predicate<AccountGroup> is(String value) throws QueryParseException {
-    if ("visibleToAll".equalsIgnoreCase(value)) {
+    if ("visibletoall".equalsIgnoreCase(value)) {
       return GroupPredicates.isVisibleToAll();
     }
     throw error("Invalid query");
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
index 274a4ed..0ecc125 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
@@ -247,13 +247,13 @@
 
   @Test
   public void byIsVisibleToAll() throws Exception {
-    assertQuery("is:visibleToAll");
+    assertQuery("is:visibletoall");
 
     GroupInfo groupThatIsVisibleToAll =
         createGroupThatIsVisibleToAll(name("group-that-is-visible-to-all"));
     createGroup(name("group"));
 
-    assertQuery("is:visibleToAll", groupThatIsVisibleToAll);
+    assertQuery("is:visibletoall", groupThatIsVisibleToAll);
   }
 
   @Test