diff --git a/resources/sql/autopatches/20150727.heraldaction.1.sql b/resources/sql/autopatches/20150727.heraldaction.1.sql
new file mode 100644
index 0000000000..f4cbf19504
--- /dev/null
+++ b/resources/sql/autopatches/20150727.heraldaction.1.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_herald.herald_actionrecord
+  TO {$NAMESPACE}_herald.herald_action;
diff --git a/src/applications/herald/storage/HeraldActionRecord.php b/src/applications/herald/storage/HeraldActionRecord.php
index 1ad4721b21..dfbee3b79d 100644
--- a/src/applications/herald/storage/HeraldActionRecord.php
+++ b/src/applications/herald/storage/HeraldActionRecord.php
@@ -1,29 +1,37 @@
 <?php
 
 final class HeraldActionRecord extends HeraldDAO {
 
   protected $ruleID;
 
   protected $action;
   protected $target;
 
+  public function getTableName() {
+    // TODO: This class was renamed, but we have a migration which affects the
+    // table prior to to the rename. For now, having cruft here is cleaner than
+    // having it in the migration. We could rename this table again and no-op
+    // the migration after some time. See T8958.
+    return 'herald_action';
+  }
+
   protected function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(
         'target' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_COLUMN_SCHEMA => array(
         'action' => 'text255',
         'target' => 'text',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'ruleID' => array(
           'columns' => array('ruleID'),
         ),
       ),
     ) + parent::getConfiguration();
   }
 
 
 }