diff --git a/resources/sql/patches/096.filename.sql b/resources/sql/patches/096.filename.sql
new file mode 100644
index 0000000000..b52b31dd5a
--- /dev/null
+++ b/resources/sql/patches/096.filename.sql
@@ -0,0 +1,2 @@
+ALTER TABLE phabricator_differential.differential_changeset
+  CHANGE fileName filename varchar(255) NOT NULL;
diff --git a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php b/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
index 24ab8d280e..1f0943dabe 100644
--- a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
@@ -244,7 +244,7 @@ class DifferentialChangesetViewController extends DifferentialController {
 
     $inlines = array();
     foreach ($lint as $msg) {
-      if ($msg['path'] != $changeset->getFileName()) {
+      if ($msg['path'] != $changeset->getFilename()) {
         continue;
       }
       $inline = new DifferentialInlineComment();
diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
index b30e819598..719c04e22c 100644
--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
@@ -654,7 +654,7 @@ class DifferentialRevisionViewController extends DifferentialController {
 
     $indexed_langs = array_fill_keys($langs, true);
     foreach ($visible_changesets as $key => $changeset) {
-      $lang = $engine->getLanguageFromFilename($changeset->getFileName());
+      $lang = $engine->getLanguageFromFilename($changeset->getFilename());
       if (isset($indexed_langs[$lang])) {
         $symbol_indexes[$key] = array(
           'lang'      => $lang,
diff --git a/src/applications/differential/editor/revision/DifferentialRevisionEditor.php b/src/applications/differential/editor/revision/DifferentialRevisionEditor.php
index 72b7a2be66..40cec396ee 100644
--- a/src/applications/differential/editor/revision/DifferentialRevisionEditor.php
+++ b/src/applications/differential/editor/revision/DifferentialRevisionEditor.php
@@ -779,7 +779,7 @@ class DifferentialRevisionEditor {
 
     $paths = array();
     foreach ($changesets as $changeset) {
-      $paths[] = $path_prefix.'/'.$changeset->getFileName();
+      $paths[] = $path_prefix.'/'.$changeset->getFilename();
     }
 
     // Mark this as also touching all parent paths, so you can see all pending
diff --git a/src/applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php b/src/applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php
index 3935556422..318cae1036 100644
--- a/src/applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php
+++ b/src/applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php
@@ -33,7 +33,7 @@ final class DifferentialLintFieldSpecification
 
   public function renderValueForRevisionView() {
     $diff = $this->getDiff();
-    $path_changesets = mpull($diff->loadChangesets(), 'getId', 'getFileName');
+    $path_changesets = mpull($diff->loadChangesets(), 'getId', 'getFilename');
 
     $lstar = DifferentialRevisionUpdateHistoryView::renderDiffLintStar($diff);
     $lmsg = DifferentialRevisionUpdateHistoryView::getDiffLintMessage($diff);
diff --git a/src/applications/differential/storage/changeset/DifferentialChangeset.php b/src/applications/differential/storage/changeset/DifferentialChangeset.php
index b8f398ab15..66518d4e07 100644
--- a/src/applications/differential/storage/changeset/DifferentialChangeset.php
+++ b/src/applications/differential/storage/changeset/DifferentialChangeset.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ class DifferentialChangeset extends DifferentialDAO {
 
   protected $diffID;
   protected $oldFile;
-  protected $fileName;
+  protected $filename;
   protected $awayPaths;
   protected $changeType;
   protected $fileType;
@@ -155,7 +155,7 @@ class DifferentialChangeset extends DifferentialDAO {
       $base = id(new PhutilURI($diff->getSourceControlPath()))->getPath();
     }
 
-    $path = $this->getFileName();
+    $path = $this->getFilename();
     $path = rtrim($base, '/').'/'.ltrim($path, '/');
 
     $vcs = $repository->getVersionControlSystem();
@@ -177,7 +177,7 @@ class DifferentialChangeset extends DifferentialDAO {
   public function getWordWrapWidth() {
     $config = PhabricatorEnv::getEnvConfig('differential.wordwrap');
     foreach ($config as $regexp => $width) {
-      if (preg_match($regexp, $this->getFileName())) {
+      if (preg_match($regexp, $this->getFilename())) {
         return $width;
       }
     }
@@ -187,7 +187,7 @@ class DifferentialChangeset extends DifferentialDAO {
   public function getWhitespaceMatters() {
     $config = PhabricatorEnv::getEnvConfig('differential.whitespace-matters');
     foreach ($config as $regexp) {
-      if (preg_match($regexp, $this->getFileName())) {
+      if (preg_match($regexp, $this->getFilename())) {
         return true;
       }
     }
diff --git a/src/applications/differential/storage/diff/DifferentialDiff.php b/src/applications/differential/storage/diff/DifferentialDiff.php
index 31194f10a4..49f0c50242 100644
--- a/src/applications/differential/storage/diff/DifferentialDiff.php
+++ b/src/applications/differential/storage/diff/DifferentialDiff.php
@@ -186,7 +186,7 @@ class DifferentialDiff extends DifferentialDAO {
       $change = array(
         'metadata'      => $changeset->getMetadata(),
         'oldPath'       => $changeset->getOldFile(),
-        'currentPath'   => $changeset->getFileName(),
+        'currentPath'   => $changeset->getFilename(),
         'awayPaths'     => $changeset->getAwayPaths(),
         'oldProperties' => $changeset->getOldProperties(),
         'newProperties' => $changeset->getNewProperties(),
diff --git a/src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php b/src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php
index 2d6fda43ee..6afba23976 100644
--- a/src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php
+++ b/src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php
@@ -177,7 +177,7 @@ final class DifferentialRevisionCommentView extends AphrontView {
         $inline_render[] =
           '<tr>'.
             '<th colspan="3">'.
-              phutil_escape_html($changeset->getFileName()).
+              phutil_escape_html($changeset->getFilename()).
             '</th>'.
           '</tr>';
         foreach ($inlines as $inline) {
diff --git a/src/applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php b/src/applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php
index 155e36ff2b..f6023b609a 100644
--- a/src/applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php
+++ b/src/applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ class PhabricatorMetaMTAAttachment {
 
   public function __construct($data, $filename, $mimetype) {
     $this->setData($data);
-    $this->setFileName($filename);
+    $this->setFilename($filename);
     $this->setMimeType($mimetype);
   }
 
@@ -36,11 +36,11 @@ class PhabricatorMetaMTAAttachment {
     return $this;
   }
 
-  public function getFileName() {
+  public function getFilename() {
     return $this->filename;
   }
 
-  public function setFileName($filename) {
+  public function setFilename($filename) {
     $this->filename = $filename;
     return $this;
   }
diff --git a/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
index 7308e2f257..4e81fc3692 100644
--- a/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -326,7 +326,7 @@ class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
             foreach ($value as $attachment) {
               $mailer->addAttachment(
                 $attachment->getData(),
-                $attachment->getFileName(),
+                $attachment->getFilename(),
                 $attachment->getMimeType()
               );
             }