diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index 215d0baa..8d45ccd6 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -156,13 +156,13 @@ module Linguist
       end
     end
 
-    disambiguate "Frege", "Forth", "text" do |data|
+    disambiguate "Frege", "Forth", "Text" do |data|
       if /^(: |also |new-device|previous )/.match(data)
         Language["Forth"]
       elsif /\s*(import|module|package|data|type) /.match(data)
         Language["Frege"]
       else
-        Language["text"]
+        Language["Text"]
       end
     end
 
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 21ca139f..92c26d68 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2881,6 +2881,15 @@ Tea:
   tm_scope: source.tea
   ace_mode: text
 
+Text:
+  type: prose
+  wrap: true
+  extensions:
+  - .txt
+  - .fr
+  tm_scope: none
+  ace_mode: text
+
 Textile:
   type: prose
   ace_mode: textile
@@ -3242,15 +3251,6 @@ reStructuredText:
   - .rest
   ace_mode: text
 
-text:
-  type: prose
-  wrap: true
-  extensions:
-  - .txt
-  - .fr
-  tm_scope: none
-  ace_mode: text
-
 wisp:
   type: programming
   ace_mode: clojure
diff --git a/samples/text/ISO-2022-KR.txt b/samples/Text/ISO-2022-KR.txt
similarity index 100%
rename from samples/text/ISO-2022-KR.txt
rename to samples/Text/ISO-2022-KR.txt
diff --git a/samples/text/foo.txt b/samples/Text/foo.txt
similarity index 100%
rename from samples/text/foo.txt
rename to samples/Text/foo.txt
diff --git a/samples/text/mac.txt b/samples/Text/mac.txt
similarity index 100%
rename from samples/text/mac.txt
rename to samples/Text/mac.txt
diff --git a/samples/text/messages.fr b/samples/Text/messages.fr
similarity index 100%
rename from samples/text/messages.fr
rename to samples/Text/messages.fr
diff --git a/samples/text/readme.txt b/samples/Text/readme.txt
similarity index 100%
rename from samples/text/readme.txt
rename to samples/Text/readme.txt
diff --git a/test/test_blob.rb b/test/test_blob.rb
index f3140516..6e588442 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -64,7 +64,7 @@ class TestBlob < Test::Unit::TestCase
     assert_equal "attachment; filename=linguist.gem", fixture_blob("Binary/linguist.gem").disposition
     assert_equal "attachment; filename=octocat.ai", fixture_blob("Binary/octocat.ai").disposition
     assert_equal "inline", fixture_blob("Data/README").disposition
-    assert_equal "inline", sample_blob("text/foo.txt").disposition
+    assert_equal "inline", sample_blob("Text/foo.txt").disposition
     assert_equal "inline", sample_blob("Ruby/grit.rb").disposition
     assert_equal "inline", fixture_blob("Binary/octocat.png").disposition
   end
@@ -75,7 +75,7 @@ class TestBlob < Test::Unit::TestCase
 
   def test_lines
     assert_equal ["module Foo", "end", ""], sample_blob("Ruby/foo.rb").lines
-    assert_equal ["line 1", "line 2", ""], sample_blob("text/mac.txt").lines
+    assert_equal ["line 1", "line 2", ""], sample_blob("Text/mac.txt").lines
     assert_equal 475, sample_blob("Emacs Lisp/ess-julia.el").lines.length
   end
 
@@ -104,14 +104,14 @@ class TestBlob < Test::Unit::TestCase
   def test_encoding
     assert_equal "ISO-8859-2", fixture_blob("Data/README").encoding
     assert_equal "ISO-8859-2", fixture_blob("Data/README").ruby_encoding
-    assert_equal "UTF-8", sample_blob("text/foo.txt").encoding
-    assert_equal "UTF-8", sample_blob("text/foo.txt").ruby_encoding
+    assert_equal "UTF-8", sample_blob("Text/foo.txt").encoding
+    assert_equal "UTF-8", sample_blob("Text/foo.txt").ruby_encoding
     assert_equal "UTF-16LE", fixture_blob("Data/utf16le").encoding
     assert_equal "UTF-16LE", fixture_blob("Data/utf16le").ruby_encoding
     assert_equal "UTF-16LE", fixture_blob("Data/utf16le-windows").encoding
     assert_equal "UTF-16LE", fixture_blob("Data/utf16le-windows").ruby_encoding
-    assert_equal "ISO-2022-KR", sample_blob("text/ISO-2022-KR.txt").encoding
-    assert_equal "binary", sample_blob("text/ISO-2022-KR.txt").ruby_encoding
+    assert_equal "ISO-2022-KR", sample_blob("Text/ISO-2022-KR.txt").encoding
+    assert_equal "binary", sample_blob("Text/ISO-2022-KR.txt").ruby_encoding
     assert_nil fixture_blob("Binary/dog.o").encoding
   end
 
diff --git a/test/test_heuristics.rb b/test/test_heuristics.rb
index 20e41ac9..2417c77e 100644
--- a/test/test_heuristics.rb
+++ b/test/test_heuristics.rb
@@ -122,7 +122,7 @@ class TestHeuristcs < Test::Unit::TestCase
     assert_heuristics({
       "Frege" => all_fixtures("Frege"),
       "Forth" => all_fixtures("Forth"),
-      "text" => all_fixtures("text")
+      "Text" => all_fixtures("Text")
     })
   end