diff --git a/ChangeLog b/ChangeLog
index 0ebb753c64..5ee8ba2c23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 19 12:28:01 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* test/csv/*:  Renamed tc_* files to test_* to fit in within Ruby's
+	  testing process.
+
 Sun Oct 19 00:15:03 2008  Tanaka Akira  <akr@fsij.org>
 
 	* lib/test/unit.rb (assert_nothing_thrown): don't intern.
diff --git a/test/csv/tc_csv_parsing.rb b/test/csv/test_csv_parsing.rb
similarity index 100%
rename from test/csv/tc_csv_parsing.rb
rename to test/csv/test_csv_parsing.rb
diff --git a/test/csv/tc_csv_writing.rb b/test/csv/test_csv_writing.rb
similarity index 100%
rename from test/csv/tc_csv_writing.rb
rename to test/csv/test_csv_writing.rb
diff --git a/test/csv/tc_data_converters.rb b/test/csv/test_data_converters.rb
similarity index 100%
rename from test/csv/tc_data_converters.rb
rename to test/csv/test_data_converters.rb
diff --git a/test/csv/tc_encodings.rb b/test/csv/test_encodings.rb
similarity index 100%
rename from test/csv/tc_encodings.rb
rename to test/csv/test_encodings.rb
diff --git a/test/csv/tc_features.rb b/test/csv/test_features.rb
similarity index 100%
rename from test/csv/tc_features.rb
rename to test/csv/test_features.rb
diff --git a/test/csv/tc_headers.rb b/test/csv/test_headers.rb
similarity index 100%
rename from test/csv/tc_headers.rb
rename to test/csv/test_headers.rb
diff --git a/test/csv/tc_interface.rb b/test/csv/test_interface.rb
similarity index 100%
rename from test/csv/tc_interface.rb
rename to test/csv/test_interface.rb
diff --git a/test/csv/tc_row.rb b/test/csv/test_row.rb
similarity index 100%
rename from test/csv/tc_row.rb
rename to test/csv/test_row.rb
diff --git a/test/csv/tc_serialization.rb b/test/csv/test_serialization.rb
similarity index 100%
rename from test/csv/tc_serialization.rb
rename to test/csv/test_serialization.rb
diff --git a/test/csv/tc_table.rb b/test/csv/test_table.rb
similarity index 100%
rename from test/csv/tc_table.rb
rename to test/csv/test_table.rb
diff --git a/test/csv/ts_all.rb b/test/csv/ts_all.rb
index d380ab5318..4fadbb46e9 100644
--- a/test/csv/ts_all.rb
+++ b/test/csv/ts_all.rb
@@ -9,13 +9,13 @@
 
 require "test/unit"
 
-require "tc_csv_parsing"
-require "tc_features"
-require "tc_interface"
-require "tc_csv_writing"
-require "tc_data_converters"
-require "tc_row"
-require "tc_table"
-require "tc_headers"
-require "tc_serialization"
-require "tc_encodings"
+require "test_csv_parsing"
+require "test_features"
+require "test_interface"
+require "test_csv_writing"
+require "test_data_converters"
+require "test_row"
+require "test_table"
+require "test_headers"
+require "test_serialization"
+require "test_encodings"