diff --git a/PDFFont.js b/fonts.js
similarity index 100%
rename from PDFFont.js
rename to fonts.js
diff --git a/PDFFontUtils.js b/fonts_utils.js
similarity index 100%
rename from PDFFontUtils.js
rename to fonts_utils.js
diff --git a/test.html b/test.html
index 276ba30da..023cdeec2 100644
--- a/test.html
+++ b/test.html
@@ -1,15 +1,14 @@
 <html>
-<<<<<<< HEAD
     <head>
         <title>Simple pdf.js page viewer</title>
         <link rel="stylesheet" href="test.css"></link>
 
-        <script type="text/javascript" src="pdf.js"></script>
         <script type="text/javascript" src="test.js"></script>
+        <script type="text/javascript" src="pdf.js"></script>
+        <script type="text/javascript" src="fonts.js"></script>
         <script type="text/javascript" src="cffStandardStrings.js"></script>
-        <script type="text/javascript" src="glyphlist.js"></script>
         <script type="text/javascript" src="Encodings.js"></script>
-        <script type="text/javascript" src="PDFFont.js"></script>
+        <script type="text/javascript" src="glyphlist.js"></script>
   </head>
 
   <body onload="load();">
