diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
@@ -8,7 +8,7 @@
   private $rangeBegin;
   private $rangeEnd;
   private $inviteePHIDs;
-  private $creatorPHIDs;
+  private $hostPHIDs;
   private $isCancelled;
   private $eventsWithNoParent;
   private $instanceSequencePairs;
@@ -46,8 +46,8 @@
     return $this;
   }
 
-  public function withCreatorPHIDs(array $phids) {
-    $this->creatorPHIDs = $phids;
+  public function withHostPHIDs(array $phids) {
+    $this->hostPHIDs = $phids;
     return $this;
   }
 
@@ -370,11 +370,11 @@
         $this->inviteePHIDs);
     }
 
-    if ($this->creatorPHIDs) {
+    if ($this->hostPHIDs) {
       $where[] = qsprintf(
         $conn,
-        'event.userPHID IN (%Ls)',
-        $this->creatorPHIDs);
+        'event.hostPHID IN (%Ls)',
+        $this->hostPHIDs);
     }
 
     if ($this->isCancelled !== null) {
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -26,8 +26,9 @@
   protected function buildCustomSearchFields() {
     return array(
       id(new PhabricatorSearchDatasourceField())
-        ->setLabel(pht('Created By'))
-        ->setKey('creatorPHIDs')
+        ->setLabel(pht('Hosts'))
+        ->setKey('hostPHIDs')
+        ->setAliases(array('host', 'hostPHID', 'hosts'))
         ->setDatasource(new PhabricatorPeopleUserFunctionDatasource()),
       id(new PhabricatorSearchDatasourceField())
         ->setLabel(pht('Invited'))
@@ -78,8 +79,8 @@
     $query = $this->newQuery();
     $viewer = $this->requireViewer();
 
-    if ($map['creatorPHIDs']) {
-      $query->withCreatorPHIDs($map['creatorPHIDs']);
+    if ($map['hostPHIDs']) {
+      $query->withHostPHIDs($map['hostPHIDs']);
     }
 
     if ($map['invitedPHIDs']) {