diff --git a/ChangeLog b/ChangeLog
index 47ee7a6e7e..48518d9e74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct 19 11:09:09 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb, lib/unicode_normalize.rb:
+	  File name change from lib/unicode_normalize/normalize_tables.rb
+	  to lib/unicode_normalize/tables.rb.
+
 Sun Oct 19 10:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
 
 	* lib/unicode_normalize.rb: Changing method names, see
diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb
index 05f7bf9b15..34b06de93c 100644
--- a/lib/unicode_normalize/normalize.rb
+++ b/lib/unicode_normalize/normalize.rb
@@ -2,7 +2,7 @@
 
 # Copyright Ayumu Nojima (野島 歩) and Martin J. Dürst (duerst@it.aoyama.ac.jp)
 
-require_relative 'normalize_tables'
+require 'unicode_normalize/tables'
 
 
 module UnicodeNormalize
diff --git a/tool/unicode_norm_gen.rb b/tool/unicode_norm_gen.rb
index 65eb7a409b..86fd571c9d 100644
--- a/tool/unicode_norm_gen.rb
+++ b/tool/unicode_norm_gen.rb
@@ -135,7 +135,7 @@ class_table_str = CombiningClass.collect do |key, value|
 end.line_slice "\n    "
 
 # generate normalization tables file
-open("#{OuputDataDir}/normalize_tables.rb", "w").print <<MAPPING_TABLE_FILE_END
+open("#{OuputDataDir}/tables.rb", "w").print <<MAPPING_TABLE_FILE_END
 # coding: us-ascii
 
 # automatically generated by tool/unicode_norm_gen.rb