diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 580a3856..1158c044 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -97,7 +97,7 @@ module Jekyll
 
     def to_liquid
       {
-        "filename"      => File.basename(name, extname),
+        "name"          => File.basename(name, extname),
         "extname"       => extname,
         "modified_time" => modified_time,
         "path"          => File.join("", relative_path)
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index 1685bb9d..a53dc952 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -134,7 +134,7 @@ class TestStaticFile < JekyllUnitTest
 
     should "be able to convert to liquid" do
       expected = {
-        "filename"      => "static_file",
+        "name"          => "static_file",
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
         "path"          => "/static_file.txt"