diff --git a/phpBB/develop/generate_utf_casefold.php b/phpBB/develop/generate_utf_casefold.php
index a0e90a679c..68cc83d880 100644
--- a/phpBB/develop/generate_utf_casefold.php
+++ b/phpBB/develop/generate_utf_casefold.php
@@ -63,7 +63,7 @@ foreach ($array as $value)
 foreach ($uniarray as $idx => $contents)
 {
 	echo "Writing to case_fold_$idx.$phpEx\n";
-	$fp = fopen($phpbb_root_path . 'includes/utf/data/case_fold_' . $idx . '.' . $phpEx, 'wb');
+	$fp = fopen($phpbb_root_path . 'includes/utf/data/case_fold_' . strtolower($idx) . '.' . $phpEx, 'wb');
 	fwrite($fp, '<?php return ' . my_var_export($contents) . ';');
 	fclose($fp);
 }
diff --git a/phpBB/includes/utf/data/case_fold_C.php b/phpBB/includes/utf/data/case_fold_c.php
similarity index 100%
rename from phpBB/includes/utf/data/case_fold_C.php
rename to phpBB/includes/utf/data/case_fold_c.php
diff --git a/phpBB/includes/utf/data/case_fold_F.php b/phpBB/includes/utf/data/case_fold_f.php
similarity index 100%
rename from phpBB/includes/utf/data/case_fold_F.php
rename to phpBB/includes/utf/data/case_fold_f.php
diff --git a/phpBB/includes/utf/data/case_fold_S.php b/phpBB/includes/utf/data/case_fold_s.php
similarity index 100%
rename from phpBB/includes/utf/data/case_fold_S.php
rename to phpBB/includes/utf/data/case_fold_s.php
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index 4adb1b2952..8f88cc391f 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -945,31 +945,31 @@ function utf8_case_fold($text, $option = 'full')
 	global $phpbb_root_path, $phpEx;
 
 	// common is always set
-	if (!isset($uniarray['C']))
+	if (!isset($uniarray['c']))
 	{
-		$uniarray['C'] = include($phpbb_root_path . 'includes/utf/data/case_fold_C.' . $phpEx);
+		$uniarray['c'] = include_once($phpbb_root_path . 'includes/utf/data/case_fold_c.' . $phpEx);
 	}
 
 	// only set full if we need to
-	if ($option === 'full' && !isset($uniarray['F']))
+	if ($option === 'full' && !isset($uniarray['f']))
 	{
-		$uniarray['F'] = include($phpbb_root_path . 'includes/utf/data/case_fold_F.' . $phpEx);
+		$uniarray['f'] = include_once($phpbb_root_path . 'includes/utf/data/case_fold_f.' . $phpEx);
 	}
 
 	// only set simple if we need to
-	if ($option !== 'full' && !isset($uniarray['S']))
+	if ($option !== 'full' && !isset($uniarray['s']))
 	{
-		$uniarray['S'] = include($phpbb_root_path . 'includes/utf/data/case_fold_S.' . $phpEx);
+		$uniarray['s'] = include_once($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx);
 	}
 
-	$text = strtr($text, $uniarray['C']);
+	$text = strtr($text, $uniarray['c']);
 	if ($option === 'full')
 	{
-		$text = strtr($text, $uniarray['F']);
+		$text = strtr($text, $uniarray['f']);
 	}
 	else
 	{
-		$text = strtr($text, $uniarray['S']);
+		$text = strtr($text, $uniarray['s']);
 	}
 	return $text;
 }
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
index 0ef17669fa..63dfca8354 100644
--- a/phpBB/language/en/search_ignore_words.php
+++ b/phpBB/language/en/search_ignore_words.php
@@ -263,4 +263,5 @@ $words = array(
 	'ROTFLMAO',
 	'YMMV',
 );
-	
\ No newline at end of file
+
+?>
\ No newline at end of file