rename from toolkit/components/places/tests/unifiedcomplete/test_autoFill_default_behavior.js
rename to toolkit/components/places/tests/unifiedcomplete/test_autofill_default_behavior.js

rename from toolkit/components/places/tests/unifiedcomplete/test_queryurl.js
rename to toolkit/components/places/tests/unifiedcomplete/test_query_url.js

rename from toolkit/components/places/tests/unifiedcomplete/test_remotetabmatches.js
rename to toolkit/components/places/tests/unifiedcomplete/test_remote_tab_matches.js

rename from toolkit/components/places/tests/unifiedcomplete/test_searchEngine_alias.js
rename to toolkit/components/places/tests/unifiedcomplete/test_search_engine_alias.js

rename from toolkit/components/places/tests/unifiedcomplete/test_searchEngine_current.js
rename to toolkit/components/places/tests/unifiedcomplete/test_search_engine_current.js

rename from toolkit/components/places/tests/unifiedcomplete/test_searchEngine_host.js
rename to toolkit/components/places/tests/unifiedcomplete/test_search_engine_host.js

rename from toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js
rename to toolkit/components/places/tests/unifiedcomplete/test_search_engine_restyle.js

rename from toolkit/components/places/tests/unifiedcomplete/test_searchSuggestions.js
rename to toolkit/components/places/tests/unifiedcomplete/test_search_suggestions.js

rename from toolkit/components/places/tests/unifiedcomplete/test_tabmatches.js
rename to toolkit/components/places/tests/unifiedcomplete/test_tab_matches.js

rename from toolkit/components/places/tests/unifiedcomplete/test_visiturl.js
rename to toolkit/components/places/tests/unifiedcomplete/test_visit_url.js

--- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
@@ -1,48 +1,48 @@
 [DEFAULT]
 head = head_autocomplete.js
-tail = 
+tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/engine-rel-searchform.xml
   data/engine-suggestions.xml
   !/toolkit/components/places/tests/favicons/favicon-normal16.png
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
 [test_418257.js]
 [test_422277.js]
 [test_autocomplete_functional.js]
 [test_autocomplete_on_value_removed_479089.js]
-[test_autoFill_default_behavior.js]
+[test_autofill_default_behavior.js]
 [test_avoid_middle_complete.js]
 [test_avoid_stripping_to_empty_tokens.js]
 [test_casing.js]
 [test_do_not_trim.js]
 [test_download_embed_bookmarks.js]
 [test_dupe_urls.js]
 [test_empty_search.js]
 [test_enabled.js]
 [test_escape_self.js]
 [test_ignore_protocol.js]
 [test_keyword_search.js]
 [test_keyword_search_actions.js]
 [test_keywords.js]
 [test_match_beginning.js]
 [test_multi_word_search.js]
-[test_queryurl.js]
-[test_remotetabmatches.js]
+[test_query_url.js]
+[test_remote_tab_matches.js]
 skip-if = !sync
-[test_searchEngine_alias.js]
-[test_searchEngine_current.js]
-[test_searchEngine_host.js]
-[test_searchEngine_restyle.js]
-[test_searchSuggestions.js]
+[test_search_engine_alias.js]
+[test_search_engine_current.js]
+[test_search_engine_host.js]
+[test_search_engine_restyle.js]
+[test_search_suggestions.js]
 [test_special_search.js]
 [test_swap_protocol.js]
-[test_tabmatches.js]
+[test_tab_matches.js]
 [test_trimming.js]
 [test_typed.js]
-[test_visiturl.js]
+[test_visit_url.js]
 [test_word_boundary_search.js]
 [test_zero_frecency.js]