From 98fb0f1cec41af8942a4feca6682f895ddc509c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <mailport@mikescher.de>
Date: Wed, 28 May 2014 11:02:52 +0200
Subject: [PATCH] Renamed "Programme" to "Programs"/"Program"

---
 .idea/workspace.xml                           | 367 ++++++++----------
 ...{ProgrammeHelper.php => ProgramHelper.php} |  10 +-
 www/protected/config/main.php                 |   6 +-
 ...eController.php => ProgramsController.php} |  26 +-
 www/protected/controllers/SiteController.php  |   2 +-
 .../models/{Programme.php => Program.php}     |  10 +-
 www/protected/views/layouts/main.php          |   4 +-
 www/protected/views/programme/create.php      |  20 -
 www/protected/views/programme/update.php      |  23 --
 .../views/{programme => programs}/_form.php   |   6 +-
 .../views/{programme => programs}/_search.php |   4 +-
 .../views/{programme => programs}/_view.php   |   4 +-
 .../views/{programme => programs}/admin.php   |  16 +-
 www/protected/views/programs/create.php       |  20 +
 .../views/{programme => programs}/index.php   |  10 +-
 www/protected/views/programs/update.php       |  23 ++
 .../views/{programme => programs}/view.php    |  18 +-
 www/protected/views/site/about.php            |   4 +-
 www/protected/views/site/index.php            |   2 +-
 19 files changed, 263 insertions(+), 312 deletions(-)
 rename www/protected/components/{ProgrammeHelper.php => ProgramHelper.php} (85%)
 rename www/protected/controllers/{ProgrammeController.php => ProgramsController.php} (87%)
 rename www/protected/models/{Programme.php => Program.php} (95%)
 delete mode 100644 www/protected/views/programme/create.php
 delete mode 100644 www/protected/views/programme/update.php
 rename www/protected/views/{programme => programs}/_form.php (96%)
 rename www/protected/views/{programme => programs}/_search.php (97%)
 rename www/protected/views/{programme => programs}/_view.php (97%)
 rename www/protected/views/{programme => programs}/admin.php (81%)
 create mode 100644 www/protected/views/programs/create.php
 rename www/protected/views/{programme => programs}/index.php (58%)
 create mode 100644 www/protected/views/programs/update.php
 rename www/protected/views/{programme => programs}/view.php (50%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3fb41ef..934b69b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -63,96 +63,15 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
+      <file leaf-file-name="about.php" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="48" column="64" selection-start="1019" selection-end="1019" vertical-scroll-proportion="-11.115385" vertical-offset="527" max-vertical-offset="1751">
-              <folding>
-                <marker date="1401264485118" expanded="true" signature="333:2035" placeholder="..." />
-                <marker date="1401264485118" expanded="true" signature="946:1826" placeholder="..." />
-                <marker date="1401264485118" expanded="true" signature="972:1025" placeholder="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ProgrammeController.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="42" column="14" selection-start="1098" selection-end="1098" vertical-scroll-proportion="-15.692307" vertical-offset="306" max-vertical-offset="3128">
+            <state line="26" column="78" selection-start="790" selection-end="790" vertical-scroll-proportion="0.762069" vertical-offset="0" max-vertical-offset="1530">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="login.php" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/www/protected/views/site/login.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="37" column="59" selection-start="956" selection-end="956" vertical-scroll-proportion="0.5284974" vertical-offset="323" max-vertical-offset="1020">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="49" column="79" selection-start="1922" selection-end="1922" vertical-scroll-proportion="-8.423077" vertical-offset="614" max-vertical-offset="1785">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/main.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="35" column="138" selection-start="1532" selection-end="1750" vertical-scroll-proportion="-11.115385" vertical-offset="306" max-vertical-offset="1105">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="45" column="42" selection-start="748" selection-end="1003" vertical-scroll-proportion="-11.769231" vertical-offset="459" max-vertical-offset="1564">
-              <folding>
-                <marker date="1401262284212" expanded="true" signature="824:847" placeholder="SELECT * FRO..programme..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SiteController.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="72" column="22" selection-start="1270" selection-end="1270" vertical-scroll-proportion="-4.3846154" vertical-offset="1110" max-vertical-offset="1734">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LoginForm.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/models/LoginForm.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="25.5" vertical-offset="663" max-vertical-offset="1411">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="UserIdentity.php" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="26" column="27" selection-start="804" selection-end="804" vertical-scroll-proportion="-11.807693" vertical-offset="135" max-vertical-offset="714">
-              <folding>
-                <marker date="1401266225595" expanded="true" signature="646:705" placeholder="SELECT SValu..othervalues..." />
-                <marker date="1401266225595" expanded="true" signature="652:705" placeholder="select SValu..othervalues..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -180,17 +99,31 @@
         <option value="$PROJECT_DIR$/www/css/styles.css" />
         <option value="$PROJECT_DIR$/www/javascript/scripts.js" />
         <option value="$PROJECT_DIR$/www/protected/models/Programme.php" />
-        <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
         <option value="$PROJECT_DIR$/www/protected/views/programme/index.php" />
         <option value="$PROJECT_DIR$/www/protected/components/SeededRandom.php" />
-        <option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
         <option value="$PROJECT_DIR$/www/protected/components/ProgrammeHelper.php" />
-        <option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
-        <option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
         <option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php" />
-        <option value="$PROJECT_DIR$/www/protected/config/main.php" />
         <option value="$PROJECT_DIR$/www/protected/components/UserIdentity.php" />
         <option value="$PROJECT_DIR$/www/protected/views/site/login.php" />
+        <option value="$PROJECT_DIR$/www/protected/models/Programs.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/_form.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/_search.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/_view.php" />
+        <option value="$PROJECT_DIR$/www/protected/components/ProgramsHelper.php" />
+        <option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
+        <option value="$PROJECT_DIR$/framework/logging/CLogger.php" />
+        <option value="$PROJECT_DIR$/www/protected/models/Program.php" />
+        <option value="$PROJECT_DIR$/www/protected/controllers/ProgramsController.php" />
+        <option value="$PROJECT_DIR$/www/protected/config/main.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
+        <option value="$PROJECT_DIR$/www/protected/components/ProgramHelper.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/admin.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/create.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/index.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/update.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programs/view.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
       </list>
     </option>
   </component>
@@ -371,7 +304,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="programme" />
+              <option name="myItemId" value="programs" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -740,6 +673,7 @@
     <property name="LayoutCode.rearrangeEntriesPHP" value="false" />
     <property name="restartRequiresConfirmation" value="true" />
     <property name="dynamic.classpath" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/www/protected" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -863,20 +797,20 @@
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32943678" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32837406" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2137741" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32837406" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32943678" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2137741" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33722162" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873806" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -905,11 +839,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/www/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="16" selection-start="412" selection-end="412" vertical-scroll-proportion="0.30357143" vertical-offset="0" max-vertical-offset="672" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNavbar.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.9475728" vertical-offset="488" max-vertical-offset="2176" />
@@ -980,11 +909,6 @@
         <state line="33" column="8" selection-start="603" selection-end="603" vertical-scroll-proportion="1.0872093" vertical-offset="0" max-vertical-offset="850" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/_view.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="12" selection-start="1050" selection-end="1050" vertical-scroll-proportion="0.7659208" vertical-offset="150" max-vertical-offset="731" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/models/SendMailForm.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="53" column="8" selection-start="1116" selection-end="1116" vertical-scroll-proportion="1.5507746" vertical-offset="0" max-vertical-offset="1088" />
@@ -995,11 +919,6 @@
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.8777969" vertical-offset="510" max-vertical-offset="1785" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/_form.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1190" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/column2.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="530" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="581" />
@@ -1025,36 +944,11 @@
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="607" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/_search.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.7848537" vertical-offset="456" max-vertical-offset="1037" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/update.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="14" selection-start="118" selection-end="118" vertical-scroll-proportion="0.20481928" vertical-offset="0" max-vertical-offset="581" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/create.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="14" selection-start="118" selection-end="118" vertical-scroll-proportion="0.20481928" vertical-offset="0" max-vertical-offset="581" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/view.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="14" selection-start="118" selection-end="118" vertical-scroll-proportion="0.0" vertical-offset="320" max-vertical-offset="901" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="19" column="25" selection-start="500" selection-end="500" vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="680" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/admin.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="46" column="7" selection-start="1087" selection-end="1087" vertical-scroll-proportion="0.0" vertical-offset="524" max-vertical-offset="1411" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/css/styles.css">
       <provider selected="true" editor-type-id="text-editor">
         <state line="41" column="14" selection-start="650" selection-end="650" vertical-scroll-proportion="0.0" vertical-offset="298" max-vertical-offset="884">
@@ -1079,13 +973,6 @@
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="599" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/models/Programme.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="104" column="5" selection-start="3356" selection-end="3356" vertical-scroll-proportion="2.3053572" vertical-offset="477" max-vertical-offset="2567">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/framework/web/CController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-0.2155797" vertical-offset="13209" max-vertical-offset="20910">
@@ -1102,27 +989,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-9.807693" vertical-offset="102" max-vertical-offset="680">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/components/ProgrammeHelper.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="95" selection-start="908" selection-end="908" vertical-scroll-proportion="0.19197208" vertical-offset="502" max-vertical-offset="1360">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="29" column="36" selection-start="881" selection-end="881" vertical-scroll-proportion="-0.80977315" vertical-offset="957" max-vertical-offset="1530">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/demos/default/protected/controllers/SiteController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="74" column="0" selection-start="1876" selection-end="2673" vertical-scroll-proportion="-2.6153846" vertical-offset="1190" max-vertical-offset="1938">
@@ -1137,13 +1003,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="49" column="79" selection-start="1922" selection-end="1922" vertical-scroll-proportion="-8.423077" vertical-offset="614" max-vertical-offset="1785">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/main.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="35" column="138" selection-start="1532" selection-end="1750" vertical-scroll-proportion="-11.115385" vertical-offset="306" max-vertical-offset="1105">
@@ -1151,13 +1010,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="72" column="22" selection-start="1270" selection-end="1270" vertical-scroll-proportion="-4.3846154" vertical-offset="1110" max-vertical-offset="1734">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/models/LoginForm.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="25.5" vertical-offset="663" max-vertical-offset="1411">
@@ -1165,46 +1017,145 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="64" selection-start="1019" selection-end="1019" vertical-scroll-proportion="-11.115385" vertical-offset="527" max-vertical-offset="1751">
-          <folding>
-            <marker date="1401264485118" expanded="true" signature="333:2035" placeholder="..." />
-            <marker date="1401264485118" expanded="true" signature="946:1826" placeholder="..." />
-            <marker date="1401264485118" expanded="true" signature="972:1025" placeholder="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="14" selection-start="1098" selection-end="1098" vertical-scroll-proportion="-15.692307" vertical-offset="306" max-vertical-offset="3128">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/components/UserIdentity.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="26" column="27" selection-start="804" selection-end="804" vertical-scroll-proportion="-11.807693" vertical-offset="135" max-vertical-offset="714">
           <folding>
-            <marker date="1401266225595" expanded="true" signature="646:705" placeholder="SELECT SValu..othervalues..." />
-            <marker date="1401266225595" expanded="true" signature="652:705" placeholder="select SValu..othervalues..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="42" selection-start="748" selection-end="1003" vertical-scroll-proportion="-11.769231" vertical-offset="459" max-vertical-offset="1564">
-          <folding>
-            <marker date="1401262284212" expanded="true" signature="824:847" placeholder="SELECT * FRO..programme..." />
+            <marker date="1401266225595" expanded="true" signature="-1:-1" placeholder="SELECT SValu..othervalues..." />
+            <marker date="1401266225595" expanded="true" signature="-1:-1" placeholder="select SValu..othervalues..." />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/views/site/login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="59" selection-start="956" selection-end="956" vertical-scroll-proportion="0.5284974" vertical-offset="323" max-vertical-offset="1020">
+        <state line="37" column="59" selection-start="956" selection-end="956" vertical-scroll-proportion="-11.769231" vertical-offset="323" max-vertical-offset="1020">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/_search.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="22" selection-start="63" selection-end="63" vertical-scroll-proportion="-1.3076923" vertical-offset="0" max-vertical-offset="1037">
+          <folding>
+            <marker date="1401267416462" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1401267416462" expanded="true" signature="-1:-1" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/_view.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="21" selection-start="27" selection-end="27" vertical-scroll-proportion="-0.65384614" vertical-offset="0" max-vertical-offset="731">
+          <folding>
+            <marker date="1401267416230" expanded="true" signature="-1:-1" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="27" selection-start="152" selection-end="152" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="1734">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/framework/logging/CLogger.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="230" column="65" selection-start="7640" selection-end="7640" vertical-scroll-proportion="-7.3076925" vertical-offset="3601" max-vertical-offset="6001">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/models/Program.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="32" column="25" selection-start="860" selection-end="860" vertical-scroll-proportion="-7.1923075" vertical-offset="357" max-vertical-offset="2567">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgramsController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="2" column="14" selection-start="21" selection-end="21" vertical-scroll-proportion="-1.3076923" vertical-offset="0" max-vertical-offset="3128">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="68" column="70" selection-start="1506" selection-end="1506" vertical-scroll-proportion="-8.461538" vertical-offset="936" max-vertical-offset="1751">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="42" column="76" selection-start="847" selection-end="847" vertical-scroll-proportion="-9.807693" vertical-offset="459" max-vertical-offset="1564">
+          <folding>
+            <marker date="1401267568830" expanded="true" signature="-1:-1" placeholder="SELECT * FRO..Programme..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="46" column="79" selection-start="1591" selection-end="1591" vertical-scroll-proportion="-7.0" vertical-offset="600" max-vertical-offset="1785">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/components/ProgramHelper.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="69" column="96" selection-start="1620" selection-end="1620" vertical-scroll-proportion="-14.307693" vertical-offset="801" max-vertical-offset="1360">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/_form.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="21" selection-start="27" selection-end="27" vertical-scroll-proportion="-0.65384614" vertical-offset="0" max-vertical-offset="1190">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/admin.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="13" selection-start="105" selection-end="105" vertical-scroll-proportion="-3.9230769" vertical-offset="0" max-vertical-offset="1411">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/create.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="13" selection-start="113" selection-end="113" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="425">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="13" selection-start="134" selection-end="134" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="680">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/update.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="13" selection-start="113" selection-end="113" vertical-scroll-proportion="-4.576923" vertical-offset="0" max-vertical-offset="476">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programs/view.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="13" selection-start="113" selection-end="113" vertical-scroll-proportion="0.20517242" vertical-offset="0" max-vertical-offset="901">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="78" selection-start="790" selection-end="790" vertical-scroll-proportion="0.762069" vertical-offset="0" max-vertical-offset="1530">
           <folding />
         </state>
       </provider>
diff --git a/www/protected/components/ProgrammeHelper.php b/www/protected/components/ProgramHelper.php
similarity index 85%
rename from www/protected/components/ProgrammeHelper.php
rename to www/protected/components/ProgramHelper.php
index 8e6cd4f..aff1463 100644
--- a/www/protected/components/ProgrammeHelper.php
+++ b/www/protected/components/ProgramHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-class ProgrammeHelper {
+class ProgramHelper {
 
 	public static function GetHighlightedProgList($doDelimiter)
 	{
@@ -10,7 +10,7 @@ class ProgrammeHelper {
 		$criteria->order = "add_date DESC";
 		$criteria->condition = "visible=1 AND enabled=1";
 		$criteria->limit = 3;
-		foreach (Programme::model()->findAll($criteria) as $row) {
+		foreach (Program::model()->findAll($criteria) as $row) {
 			$dropDownModels[] = $row;
 		}
 
@@ -23,7 +23,7 @@ class ProgrammeHelper {
 		$criteria->order = "add_date DESC";
 		$criteria->limit = 8;
 		$criteria->condition = "Sterne=4 AND visible=1 AND enabled=1";
-		foreach (Programme::model()->findAll($criteria) as $row) {
+		foreach (Program::model()->findAll($criteria) as $row) {
 			$dropDownModels[] = $row;
 		}
 
@@ -37,7 +37,7 @@ class ProgrammeHelper {
 		$criteria->condition = "DATEDIFF(CURDATE(), add_date) <= 14 AND visible=1 AND enabled=1";
 		$criteria->limit = 1;
 
-		return Programme::model()->find($criteria);
+		return Program::model()->find($criteria);
 	}
 
 	public static function GetDailyProg()
@@ -67,7 +67,7 @@ class ProgrammeHelper {
 			if (is_null($row))
 				$progDropDown[] = TbHtml::menuDivider();
 			else
-				$progDropDown[] = array('label' => $row->attributes['Name'], 'url' => '/programme/' . $row->attributes['Name']);
+				$progDropDown[] = array('label' => $row->attributes['Name'], 'url' => '/programs/' . $row->attributes['Name']);
 		}
 		return $progDropDown;
 	}
diff --git a/www/protected/config/main.php b/www/protected/config/main.php
index 35d6371..8d834d7 100644
--- a/www/protected/config/main.php
+++ b/www/protected/config/main.php
@@ -64,9 +64,9 @@ return ArrayX::merge(
 						'showScriptName' => false,
 						'rules' =>
 							[
-								'Programme/' => 'Programme/index',
-								'downloads/<action:\w+>' => 'programme/<action>', 	// Compatibility
-								'downloads/downloads.php' => 'programme/index', 	// Compatibility
+								'programs/' => 'programs/index',
+								'downloads/<action:\w+>' => 'programs/<action>', 	// Compatibility
+								'downloads/downloads.php' => 'programs/index', 	// Compatibility
 
 								'' => 'site/index',
 
diff --git a/www/protected/controllers/ProgrammeController.php b/www/protected/controllers/ProgramsController.php
similarity index 87%
rename from www/protected/controllers/ProgrammeController.php
rename to www/protected/controllers/ProgramsController.php
index 1b4563d..a82cf64 100644
--- a/www/protected/controllers/ProgrammeController.php
+++ b/www/protected/controllers/ProgramsController.php
@@ -1,6 +1,6 @@
 <?php
 
-class ProgrammeController extends Controller
+class ProgramsController extends Controller
 {
 
 	public $layout='//layouts/column2';
@@ -61,13 +61,13 @@ class ProgrammeController extends Controller
 	 */
 	public function actionCreate()
 	{
-		$model=new Programme;
+		$model=new Program();
 
 		// Uncomment the following line if AJAX validation is needed
 		// $this->performAjaxValidation($model);
 
-		if (isset($_POST['Programme'])) {
-			$model->attributes=$_POST['Programme'];
+		if (isset($_POST['Program'])) {
+			$model->attributes=$_POST['Program'];
 			if ($model->save()) {
 				$this->redirect(array('view','id'=>$model->ID));
 			}
@@ -90,8 +90,8 @@ class ProgrammeController extends Controller
 		// Uncomment the following line if AJAX validation is needed
 		// $this->performAjaxValidation($model);
 
-		if (isset($_POST['Programme'])) {
-			$model->attributes=$_POST['Programme'];
+		if (isset($_POST['Program'])) {
+			$model->attributes=$_POST['Program'];
 			if ($model->save()) {
 				$this->redirect(array('view','id'=>$model->ID));
 			}
@@ -138,10 +138,10 @@ class ProgrammeController extends Controller
 	 */
 	public function actionAdmin()
 	{
-		$model=new Programme('search');
+		$model=new Program('search');
 		$model->unsetAttributes();  // clear any default values
-		if (isset($_GET['Programme'])) {
-			$model->attributes=$_GET['Programme'];
+		if (isset($_GET['Program'])) {
+			$model->attributes=$_GET['Program'];
 		}
 
 		$this->render('admin',array(
@@ -153,12 +153,12 @@ class ProgrammeController extends Controller
 	 * Returns the data model based on the primary key given in the GET variable.
 	 * If the data model is not found, an HTTP exception will be raised.
 	 * @param integer $id the ID of the model to be loaded
-	 * @return Programme the loaded model
+	 * @return Program the loaded model
 	 * @throws CHttpException
 	 */
 	public function loadModel($id)
 	{
-		$model=Programme::model()->findByPk($id);
+		$model=Program::model()->findByPk($id);
 		if ($model===null) {
 			throw new CHttpException(404,'The requested page does not exist.');
 		}
@@ -167,11 +167,11 @@ class ProgrammeController extends Controller
 
 	/**
 	 * Performs the AJAX validation.
-	 * @param Programme $model the model to be validated
+	 * @param Program $model the model to be validated
 	 */
 	protected function performAjaxValidation($model)
 	{
-		if (isset($_POST['ajax']) && $_POST['ajax']==='programme-form') {
+		if (isset($_POST['ajax']) && $_POST['ajax']==='program-form') {
 			echo CActiveForm::validate($model);
 			Yii::app()->end();
 		}
diff --git a/www/protected/controllers/SiteController.php b/www/protected/controllers/SiteController.php
index 3b1c4aa..6d1adf0 100644
--- a/www/protected/controllers/SiteController.php
+++ b/www/protected/controllers/SiteController.php
@@ -8,7 +8,7 @@ class SiteController extends Controller
 	{
 		$data = array();
 
-		$data['program'] = ProgrammeHelper::GetDailyProg();
+		$data['program'] = ProgramHelper::GetDailyProg();
 
 		$this->render('index', $data);
 	}
diff --git a/www/protected/models/Programme.php b/www/protected/models/Program.php
similarity index 95%
rename from www/protected/models/Programme.php
rename to www/protected/models/Program.php
index 2497f11..70d4648 100644
--- a/www/protected/models/Programme.php
+++ b/www/protected/models/Program.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * This is the model class for table "programme".
+ * This is the model class for table "program".
  *
- * The followings are the available columns in table 'programme':
+ * The followings are the available columns in table 'program':
  * @property integer $ID
  * @property string $Name
  * @property double $Downloads
@@ -23,14 +23,14 @@
  * @property string $update_identifier
  * @property integer $highscore_gid
  */
-class Programme extends CActiveRecord
+class Program extends CActiveRecord
 {
 	/**
 	 * @return string the associated database table name
 	 */
 	public function tableName()
 	{
-		return 'programme';
+		return 'Programme';
 	}
 
 	/**
@@ -136,7 +136,7 @@ class Programme extends CActiveRecord
 	 * Returns the static model of the specified AR class.
 	 * Please note that you should have this exact method in all your CActiveRecord descendants!
 	 * @param string $className active record class name.
-	 * @return Programme the static model class
+	 * @return Program the static model class
 	 */
 	public static function model($className=__CLASS__)
 	{
diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php
index 2966fa6..26ba457 100644
--- a/www/protected/views/layouts/main.php
+++ b/www/protected/views/layouts/main.php
@@ -44,8 +44,8 @@
 							[
 								['label' => 'Home', 		'url' => '/', 'active' => ($this->selectedNav === 'index')],
 								['label' => 'Blog', 		'url' => '#', 'active' => ($this->selectedNav === 'blog')],
-								['label' => 'Programme', 	'url' => '/programme/', 'active' => ($this->selectedNav === 'prog')],
-								['label' => '', 			'items' => ProgrammeHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
+								['label' => 'Programs', 	'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')],
+								['label' => '', 			'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
 								['label' => 'About',		'url' => '/about', 'active' => ($this->selectedNav === 'about')],
 								['label' => '[[Log "'.Yii::app()->user->name.'" out]]',		'url' => '/logout',	'visible' => !Yii::app()->user->isGuest]
 							],
diff --git a/www/protected/views/programme/create.php b/www/protected/views/programme/create.php
deleted file mode 100644
index 85fb92e..0000000
--- a/www/protected/views/programme/create.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* @var $this ProgrammeController */
-/* @var $model Programme */
-?>
-
-<?php
-$this->breadcrumbs=array(
-	'Programme'=>array('index'),
-	'Create',
-);
-
-$this->menu=array(
-	array('label'=>'List Programme', 'url'=>array('index')),
-	array('label'=>'Manage Programme', 'url'=>array('admin')),
-);
-?>
-
-<h1>Create Programme</h1>
-
-<?php $this->renderPartial('_form', array('model'=>$model)); ?>
\ No newline at end of file
diff --git a/www/protected/views/programme/update.php b/www/protected/views/programme/update.php
deleted file mode 100644
index d010823..0000000
--- a/www/protected/views/programme/update.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/* @var $this ProgrammeController */
-/* @var $model Programme */
-?>
-
-<?php
-$this->breadcrumbs=array(
-	'Programme'=>array('index'),
-	$model->Name=>array('view','id'=>$model->ID),
-	'Update',
-);
-
-$this->menu=array(
-	array('label'=>'List Programme', 'url'=>array('index')),
-	array('label'=>'Create Programme', 'url'=>array('create')),
-	array('label'=>'View Programme', 'url'=>array('view', 'id'=>$model->ID)),
-	array('label'=>'Manage Programme', 'url'=>array('admin')),
-);
-?>
-
-    <h1>Update Programme <?php echo $model->ID; ?></h1>
-
-<?php $this->renderPartial('_form', array('model'=>$model)); ?>
\ No newline at end of file
diff --git a/www/protected/views/programme/_form.php b/www/protected/views/programs/_form.php
similarity index 96%
rename from www/protected/views/programme/_form.php
rename to www/protected/views/programs/_form.php
index 8a7abbf..2cb4730 100644
--- a/www/protected/views/programme/_form.php
+++ b/www/protected/views/programs/_form.php
@@ -1,13 +1,13 @@
 <?php
-/* @var $this ProgrammeController */
-/* @var $model Programme */
+/* @var $this ProgramController */
+/* @var $model Program */
 /* @var $form TbActiveForm */
 ?>
 
 <div class="form">
 
     <?php $form=$this->beginWidget('bootstrap.widgets.TbActiveForm', array(
-	'id'=>'programme-form',
+	'id'=>'program-form',
 	// Please note: When you enable ajax validation, make sure the corresponding
 	// controller action is handling ajax validation correctly.
 	// There is a call to performAjaxValidation() commented in generated controller code.
diff --git a/www/protected/views/programme/_search.php b/www/protected/views/programs/_search.php
similarity index 97%
rename from www/protected/views/programme/_search.php
rename to www/protected/views/programs/_search.php
index f704f1f..8ef7b05 100644
--- a/www/protected/views/programme/_search.php
+++ b/www/protected/views/programs/_search.php
@@ -1,6 +1,6 @@
 <?php
-/* @var $this ProgrammeController */
-/* @var $model Programme */
+/* @var $this ProgramController */
+/* @var $model Program */
 /* @var $form CActiveForm */
 ?>
 
diff --git a/www/protected/views/programme/_view.php b/www/protected/views/programs/_view.php
similarity index 97%
rename from www/protected/views/programme/_view.php
rename to www/protected/views/programs/_view.php
index ec6f11a..6842f71 100644
--- a/www/protected/views/programme/_view.php
+++ b/www/protected/views/programs/_view.php
@@ -1,6 +1,6 @@
 <?php
-/* @var $this ProgrammeController */
-/* @var $data Programme */
+/* @var $this ProgramController */
+/* @var $data Program */
 ?>
 
 <div class="view">
diff --git a/www/protected/views/programme/admin.php b/www/protected/views/programs/admin.php
similarity index 81%
rename from www/protected/views/programme/admin.php
rename to www/protected/views/programs/admin.php
index 0e40f01..e6446ef 100644
--- a/www/protected/views/programme/admin.php
+++ b/www/protected/views/programs/admin.php
@@ -1,16 +1,16 @@
 <?php
-/* @var $this ProgrammeController */
-/* @var $model Programme */
+/* @var $this ProgramController */
+/* @var $model Program */
 
 
 $this->breadcrumbs=array(
-	'Programme'=>array('index'),
+	'Programs'=>array('index'),
 	'Manage',
 );
 
 $this->menu=array(
-	array('label'=>'List Programme', 'url'=>array('index')),
-	array('label'=>'Create Programme', 'url'=>array('create')),
+	array('label'=>'List Program', 'url'=>array('index')),
+	array('label'=>'Create Program', 'url'=>array('create')),
 );
 
 Yii::app()->clientScript->registerScript('search', "
@@ -19,7 +19,7 @@ $('.search-button').click(function(){
 	return false;
 });
 $('.search-form form').submit(function(){
-	$('#programme-grid').yiiGridView('update', {
+	$('#program-grid').yiiGridView('update', {
 		data: $(this).serialize()
 	});
 	return false;
@@ -30,7 +30,7 @@ $('.search-form form').submit(function(){
 
 ?>
 
-<h1>Manage Programmes</h1>
+<h1>Manage Program</h1>
 
 <p>
     You may optionally enter a comparison operator (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>
@@ -47,7 +47,7 @@ or <b>=</b>) at the beginning of each of your search values to specify how the c
 <br><br>
 <?php $this->widget('bootstrap.widgets.TbGridView',array(
 	'type' => TbHtml::GRID_TYPE_BORDERED,
-	'id'=>'programme-grid',
+	'id'=>'program-grid',
 	'dataProvider'=>$model->search(),
 	'filter'=>$model,
 	'columns'=>array(
diff --git a/www/protected/views/programs/create.php b/www/protected/views/programs/create.php
new file mode 100644
index 0000000..2d9ace3
--- /dev/null
+++ b/www/protected/views/programs/create.php
@@ -0,0 +1,20 @@
+<?php
+/* @var $this ProgramController */
+/* @var $model Program */
+?>
+
+<?php
+$this->breadcrumbs=array(
+	'Programs'=>array('index'),
+	'Create',
+);
+
+$this->menu=array(
+	array('label'=>'List Program', 'url'=>array('index')),
+	array('label'=>'Manage Program', 'url'=>array('admin')),
+);
+?>
+
+<h1>Create Program</h1>
+
+<?php $this->renderPartial('_form', array('model'=>$model)); ?>
\ No newline at end of file
diff --git a/www/protected/views/programme/index.php b/www/protected/views/programs/index.php
similarity index 58%
rename from www/protected/views/programme/index.php
rename to www/protected/views/programs/index.php
index a3ec23a..77e04dc 100644
--- a/www/protected/views/programme/index.php
+++ b/www/protected/views/programs/index.php
@@ -1,16 +1,16 @@
 <?php
-/* @var $this ProgrammeController */
+/* @var $this ProgramController */
 /* @var $dataProvider CActiveDataProvider */
 ?>
 
 <?php
 $this->breadcrumbs = array(
-	'Programme',
+	'Programs',
 );
 
 $this->menu = array(
-	array('label' => 'Create Programme', 'url' => array('create')),
-	array('label' => 'Manage Programme', 'url' => array('admin')),
+	array('label' => 'Create Program', 'url' => array('create')),
+	array('label' => 'Manage Program', 'url' => array('admin')),
 );
 ?>
 
@@ -21,7 +21,7 @@ $this->menu = array(
 		<br>
 		<?php
 
-		foreach (Programme::model()->findAll() as $record) {
+		foreach (Program::model()->findAll() as $record) {
 			echo "<div class='well'>";
 			echo nl2br(print_r($record->attributes, true));
 			echo "</div>";
diff --git a/www/protected/views/programs/update.php b/www/protected/views/programs/update.php
new file mode 100644
index 0000000..725f53d
--- /dev/null
+++ b/www/protected/views/programs/update.php
@@ -0,0 +1,23 @@
+<?php
+/* @var $this ProgramController */
+/* @var $model Program */
+?>
+
+<?php
+$this->breadcrumbs=array(
+	'Programs'=>array('index'),
+	$model->Name=>array('view','id'=>$model->ID),
+	'Update',
+);
+
+$this->menu=array(
+	array('label'=>'List Program', 'url'=>array('index')),
+	array('label'=>'Create Program', 'url'=>array('create')),
+	array('label'=>'View Program', 'url'=>array('view', 'id'=>$model->ID)),
+	array('label'=>'Manage Program', 'url'=>array('admin')),
+);
+?>
+
+    <h1>Update Program <?php echo $model->ID; ?></h1>
+
+<?php $this->renderPartial('_form', array('model'=>$model)); ?>
\ No newline at end of file
diff --git a/www/protected/views/programme/view.php b/www/protected/views/programs/view.php
similarity index 50%
rename from www/protected/views/programme/view.php
rename to www/protected/views/programs/view.php
index 1c0d4ea..62f1794 100644
--- a/www/protected/views/programme/view.php
+++ b/www/protected/views/programs/view.php
@@ -1,24 +1,24 @@
 <?php
-/* @var $this ProgrammeController */
-/* @var $model Programme */
+/* @var $this ProgramController */
+/* @var $model Program */
 ?>
 
 <?php
 $this->breadcrumbs=array(
-	'Programme'=>array('index'),
+	'Programs'=>array('index'),
 	$model->Name,
 );
 
 $this->menu=array(
-	array('label'=>'List Programme', 'url'=>array('index')),
-	array('label'=>'Create Programme', 'url'=>array('create')),
-	array('label'=>'Update Programme', 'url'=>array('update', 'id'=>$model->ID)),
-	array('label'=>'Delete Programme', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->ID),'confirm'=>'Are you sure you want to delete this item?')),
-	array('label'=>'Manage Programme', 'url'=>array('admin')),
+	array('label'=>'List Program', 'url'=>array('index')),
+	array('label'=>'Create Program', 'url'=>array('create')),
+	array('label'=>'Update Program', 'url'=>array('update', 'id'=>$model->ID)),
+	array('label'=>'Delete Program', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->ID),'confirm'=>'Are you sure you want to delete this item?')),
+	array('label'=>'Manage Program', 'url'=>array('admin')),
 );
 ?>
 
-<h1>View Programme #<?php echo $model->ID; ?></h1>
+<h1>View Program #<?php echo $model->ID; ?></h1>
 
 <?php $this->widget('zii.widgets.CDetailView',array(
     'htmlOptions' => array(
diff --git a/www/protected/views/site/about.php b/www/protected/views/site/about.php
index 2b264bc..1b56152 100644
--- a/www/protected/views/site/about.php
+++ b/www/protected/views/site/about.php
@@ -22,9 +22,9 @@ $this->selectedNav = 'about';
 	<div class="well cstm-well-light">
 		<p>Welcome to my private homepage.</p>
 
-		<p>My name is Mike Schwörer, and this is my homepage - here i upload programs i write in my free time and sometimes i even write a blog entry. </p>
+		<p>My name is Mike Schwörer, and this is my homepage - here i upload program i write in my free time and sometimes i even write a blog entry. </p>
 
-		<p>If you want you can look <?php echo TbHtml::link('here', '#'); // TODO Add Link ?> at the things I programmed </p>
+		<p>If you want you can look <?php echo TbHtml::link('here', '/programs'); ?> at the things I programd </p>
 	</div>
 
 	<div class="well cstm-well-light">
diff --git a/www/protected/views/site/index.php b/www/protected/views/site/index.php
index 6171de2..e4354cc 100644
--- a/www/protected/views/site/index.php
+++ b/www/protected/views/site/index.php
@@ -40,7 +40,7 @@ $this->selectedNav = 'index';
 			<?php
 				$connection = Yii::app()->db;
 				
-				$command=$connection->createCommand("SELECT * FROM programme");
+				$command=$connection->createCommand("SELECT * FROM Programme");
 				$command->execute();   // a non-query SQL statement execution
 				// or execute an SQL query and fetch the result set
 				$reader=$command->query();