--- a/www/loc.php	Tue Mar 08 16:41:28 2016 +0200
+++ b/www/loc.php	Tue Mar 08 16:55:23 2016 +0200
@@ -86,15 +86,15 @@
 
 if (($tmpName = stGetRequestItem("a", FALSE, TRUE)) !== false)
 {
-  if (preg_match("#^([a-z]{1,15})#i", $tmpName, $m))
+  if (preg_match("#^([a-z]{1,15})#i", $tmpName, $matches))
   {
-    $coderName = $m[1];
+    $coderName = $matches[1];
     $coderName = strtoupper(substr($coderName, 0, 1)).strtolower(substr($coderName, 1));
 
     $wizTable = apc_fetch("wizTable");
     if (empty($wizTable))
     {
-      $wizTable = stReadWizInfoFiles();
+      $wizTable = mpReadWizInfoFiles();
       apc_store("wizTable", $wizTable, 3600);
     }
   }
@@ -115,7 +115,7 @@
     if (empty($locTable))
     {
       $locTable = [];
-      stParseLocFile($setName, $locTable, $applyFilter, $filter);
+      mpParseLocFile($setName, $locTable, $applyFilter, $filter);
       apc_store("loc_".$setName, $locTable, 3600);
     }
   }
@@ -130,7 +130,7 @@
   $locTable = apc_fetch("loc_locTable");
   if (empty($locTable))
   {
-    $locTable = stReadLocationFiles($applyFilter, $filter);
+    $locTable = mpReadLocationFiles($applyFilter, $filter);
     apc_store("loc_locTable", $locTable, 3600);
   }
 }
@@ -138,7 +138,7 @@
 
 /* Start of the page
  */
-printPageHeader($pageTitle." - Locations",
+mpPrintPageHeader($pageTitle." - Locations",
   "<script type=\"text/javascript\" src=\"tooltip.js\"></script>\n".
   "<meta name=\"robots\" content=\"nofollow\" />\n");
 
@@ -242,7 +242,7 @@
     }
 
     // Links, etc.
-    echo "    [<a href=\"".fingerURL($coderName)."\">Finger</a>]\n";
+    echo "    [<a href=\"".mpFingerURL($coderName)."\">Finger</a>]\n";
 
     if (qcheck($wizTable[$coderName], "homeURL", $s))
     {
@@ -339,7 +339,7 @@
       printf("  <td class=\"%s\" style=\"width: %d%%\">",
         $iv["continent"], (100 / $maxRow));
         
-      echo stGetMapLink($iv, $continentList[$iv["continent"]][4]);
+      echo mpGetMapLink($iv, $continentList[$iv["continent"]][4]);
       
       // If either freeform desc or URL field are set, we add those
       if (isset($iv["url"]) || isset($iv["freeform"]))
@@ -446,7 +446,7 @@
   }
 
   // Print out the alpha link index div
-  stPrintExtraBoxAlphaList("ch", $alphaTable);
+  mpPrintExtraBoxAlphaList("ch", $alphaTable);
 }
 else
 {