--- a/index.php	Wed Sep 10 12:53:30 2014 +0300
+++ b/index.php	Thu Sep 11 02:14:42 2014 +0300
@@ -8,6 +8,7 @@
 require "mcommon.inc.php";
 
 // Default settings
+$pageName = "OAMK Lukkari";
 $pageVersion = "2.3";
 $mobileMode = FALSE;
 $baseURI = "http://example.com/";
@@ -49,8 +50,8 @@
   ),
   
   "beta" => array(
-    "en" => " NOTICE! OAMK Lukkari v%1 is still under development. There may be bugs.",
-    "fi" => " HUOM! OAMK Lukkari v%1 on vielä kehityksen alla. Bugeja voi löytyä.",
+    "en" => " NOTICE! %2 v%1 is still under development. There may be bugs.",
+    "fi" => " HUOM! %2 v%1 on vielä kehityksen alla. Bugeja voi löytyä.",
   ),
 
   "viikossa" => array(
@@ -500,10 +501,6 @@
 }
 
 
-// Set some variables
-$pageTitle = $haveData ? $classID." / ".join("; ", $classInfo["info"]) : $classID;
-
-
 // Create references to mobile device (Apple touch) icons
 $extra = "";
 foreach (array(57 => FALSE, 76 => TRUE, 114 => TRUE, 120 => TRUE, 152 => TRUE) as $iconSize => $addSize)
@@ -515,13 +512,14 @@
 
 
 // Start printing the page
-cmPrintPageHeader($pageTitle, $extra);
+$pageTitle = $haveData ? $classID." / ".join("; ", $classInfo["info"]) : $classID;
+cmPrintPageHeader($pageTitle." - ".$pageName, $extra);
 
 
 // Info box
 echo
   "<div id=\"infobox\">\n".
-  " <div id=\"ctitle\">OAMK Lukkari v".$pageVersion."</div>\n";
+  " <div id=\"ctitle\">".$pageName." v".$pageVersion."</div>\n";
 
 if (!$mobileMode)
 {
@@ -627,7 +625,7 @@
   cmQM("contact", "ccr @ IRCNet", "ccr (at) tnsp (dot) org").
   " / ".
   cmQM("updated", strftime("%d.%m.%Y, %H:%M", $timestamp)).
-  //" <div style=\"color: red;\">".cmQM("beta", $pageVersion)."</div>\n".
+  //" <div style=\"color: red;\">".cmQM("beta", $pageVersion, $pageName)."</div>\n".
   "</div>\n";
 
 cmPrintPageFooter();