diff --git a/resources/sql/autopatches/20190718.paste.01.edge.sql b/resources/sql/autopatches/20190718.paste.01.edge.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20190718.paste.01.edge.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_pastebin.edge
+  TO {$NAMESPACE}_paste.edge;
diff --git a/resources/sql/autopatches/20190718.paste.02.edgedata.sql b/resources/sql/autopatches/20190718.paste.02.edgedata.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20190718.paste.02.edgedata.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_pastebin.edgedata
+  TO {$NAMESPACE}_paste.edgedata;
diff --git a/resources/sql/autopatches/20190718.paste.03.paste.sql b/resources/sql/autopatches/20190718.paste.03.paste.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20190718.paste.03.paste.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_pastebin.pastebin_paste
+  TO {$NAMESPACE}_paste.paste;
diff --git a/resources/sql/autopatches/20190718.paste.04.xaction.sql b/resources/sql/autopatches/20190718.paste.04.xaction.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20190718.paste.04.xaction.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_pastebin.pastebin_pastetransaction
+  TO {$NAMESPACE}_paste.paste_transaction;
diff --git a/resources/sql/autopatches/20190718.paste.05.comment.sql b/resources/sql/autopatches/20190718.paste.05.comment.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20190718.paste.05.comment.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_pastebin.pastebin_pastetransaction_comment
+  TO {$NAMESPACE}_paste.paste_transaction_comment;
diff --git a/src/applications/paste/storage/PhabricatorPasteDAO.php b/src/applications/paste/storage/PhabricatorPasteDAO.php
--- a/src/applications/paste/storage/PhabricatorPasteDAO.php
+++ b/src/applications/paste/storage/PhabricatorPasteDAO.php
@@ -3,7 +3,7 @@
 abstract class PhabricatorPasteDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
-    return 'pastebin';
+    return 'paste';
   }
 
 }
diff --git a/src/applications/paste/storage/PhabricatorPasteTransaction.php b/src/applications/paste/storage/PhabricatorPasteTransaction.php
--- a/src/applications/paste/storage/PhabricatorPasteTransaction.php
+++ b/src/applications/paste/storage/PhabricatorPasteTransaction.php
@@ -8,7 +8,7 @@
   const MAILTAG_COMMENT = 'paste-comment';
 
   public function getApplicationName() {
-    return 'pastebin';
+    return 'paste';
   }
 
   public function getApplicationTransactionType() {
diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
--- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
+++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
@@ -67,7 +67,9 @@
       'db.metamta' => array(),
       'db.oauth_server' => array(),
       'db.owners' => array(),
-      'db.pastebin' => array(),
+      'db.pastebin' => array(
+        'dead' => true,
+      ),
       'db.phame' => array(),
       'db.phriction' => array(),
       'db.project' => array(),
@@ -113,6 +115,7 @@
       'db.badges' => array(),
       'db.packages' => array(),
       'db.application' => array(),
+      'db.paste' => array(),
       '0000.legacy.sql' => array(
         'legacy' => 0,
       ),