diff --git a/backup/backup_check.html b/backup/backup_check.html
index bbfaca4b6a9..7e3a421e828 100644
--- a/backup/backup_check.html
+++ b/backup/backup_check.html
@@ -87,7 +87,7 @@
     }
 ?>
 
-<form name="form" method="post" action="<?php echo $ME ?>">
+<form name="form" method="post" action="backup.php">
 <table cellpadding="5">
 <?php
 
diff --git a/backup/backup_form.html b/backup/backup_form.html
index 58a84140024..673cb2d8c62 100644
--- a/backup/backup_form.html
+++ b/backup/backup_form.html
@@ -87,7 +87,7 @@
 
 ?>
 
-<form name="form" method="post" action="<?php echo $ME ?>">
+<form name="form" method="post" action="backup.php">
 <table cellpadding="5">
 <?php
     if ($allmods = get_records("modules") ) {
diff --git a/backup/restore_form.html b/backup/restore_form.html
index bdbc3d09e99..c12920a1d20 100644
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -121,7 +121,7 @@ function selectItemInMenuByName(formId, menuName, selectIndex ) {
 -->
 </script>
 
-<form name="form1" id="form1" method="post" action="<?php echo $ME ?>">
+<form name="form1" id="form1" method="post" action="restore.php">
 <table cellpadding="5">
 <?php
 
diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index e1fa47dfda8..e251a109b2a 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -424,7 +424,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
     /// Returns a list of other wikis to display, depending on the type, group and user.
     /// Returns the key containing the currently selected entry as well.
 
-    global $CFG, $ME, $id;
+    global $CFG, $id;
 
     $wikis = false;
 
@@ -458,7 +458,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                             $pagename = $defpagename;
                         }
 
-                        $key = $ME.'?id='.$id.'&userid='.$student->id.'&page='.$pagename;
+                        $key = 'view.php?id='.$id.'&userid='.$student->id.'&page='.$pagename;
                         $wikis[$key] = fullname($student).':'.$pagename;
                     }
                 }
@@ -476,7 +476,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                             $pagename = $defpagename;
                         }
 
-                        $key = $ME.'?id='.$id.'&userid='.$student->id.'&page='.$pagename;
+                        $key = 'view.php?id='.$id.'&userid='.$student->id.'&page='.$pagename;
                         $wikis[$key] = fullname($student).':'.$pagename;
                     }
                 }
@@ -493,7 +493,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                         else {
                             $pagename = $defpagename;
                         }
-                        $key = $ME.'?id='.$id.'&userid='.$student->id.'&page='.$pagename;
+                        $key = 'view.php?id='.$id.'&userid='.$student->id.'&page='.$pagename;
                         $wikis[$key] = fullname($student).':'.$pagename;
                     }
                 }
@@ -505,7 +505,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                 $wiki_entries = get_records_sql($sql);
                 $wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
                 foreach ($wiki_entries as $wiki_entry) {
-                    $key = $ME.'?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
+                    $key = 'view.php?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
                     $wikis[$key] = fullname($wiki_entry).':'.$wiki_entry->pagename;
                     if ($currentid == $wiki_entry->id) {
                         $wikis['selected'] = $key;
@@ -537,7 +537,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                 $wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
                 foreach ($wiki_entries as $wiki_entry) {
                     if (($viewall === true) or ismember($viewall, $wiki_entry->userid)) {
-                        $key = $ME.'?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
+                        $key = 'view.php?id='.$id.'&userid='.$wiki_entry->userid.'&page='.$wiki_entry->pagename;
                         $wikis[$key] = fullname($wiki_entry).':'.$wiki_entry->pagename;
                         if ($currentid == $wiki_entry->id) {
                             $wikis['selected'] = $key;
@@ -568,7 +568,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                         $pagename = $defpagename;
                     }
 
-                    $key = $ME.'?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
+                    $key = 'view.php?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
                     $wikis[$key] = $group->name.':'.$pagename;
                 }
             }
@@ -582,7 +582,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
             $wiki_entries = get_records_sql($sql);
             $wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
             foreach ($wiki_entries as $wiki_entry) {
-                $key = $ME.'?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
+                $key = 'view.php?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
                 $wikis[$key] = $wiki_entry->gname.':'.$wiki_entry->pagename;
                 if ($currentid == $wiki_entry->id) {
                     $wikis['selected'] = $key;
@@ -608,7 +608,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                             $pagename = $defpagename;
                         }
 
-                        $key = $ME.'?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
+                        $key = 'view.php?id='.$id.($group->id?"&groupid=".$group->id:"").'&page='.$pagename;
                         $wikis[$key] = $group->name.':'.$pagename;
                     }
                 }
@@ -622,7 +622,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                 $wiki_entries = get_records_sql($sql);
                 $wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
                 foreach ($wiki_entries as $wiki_entry) {
-                    $key = $ME.'?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
+                    $key = 'view.php?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
                     $wikis[$key] = $wiki_entry->gname.':'.$wiki_entry->pagename;
                     if ($currentid == $wiki_entry->id) {
                         $wikis['selected'] = $key;
@@ -651,7 +651,7 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
                 $wiki_entries=is_array($wiki_entries)?$wiki_entries:array();
                 foreach ($wiki_entries as $wiki_entry) {
                     if (($viewall === true) or $viewall == $wiki_entry->groupid) {
-                        $key = $ME.'?id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
+                        $key = 'view.php??id='.$id.($wiki_entry->groupid?"&groupid=".$wiki_entry->groupid:"").'&page='.$wiki_entry->pagename;
                         $wikis[$key] = $wiki_entry->gname.':'.$wiki_entry->pagename;
                         if ($currentid == $wiki_entry->id) {
                             $wikis['selected'] = $key;
@@ -1008,10 +1008,8 @@ function wiki_print_page_actions($cmid, $specialpages, $page, $action, $binary=f
 
 function wiki_print_administration_actions($wiki, $cmid, $userid, $groupid, $page, $noeditor, $course) {
 /// Displays actions which can be performed on the page
-  global $ME;
-
-
-  /// Create the URL
+    
+  /// Create the URL        
   $ewscript = 'admin.php?id='.$cmid;
   if (isset($userid) && $userid!=0) $ewscript .= '&amp;userid='.$userid;
   if (isset($groupid) && $groupid!=0) $ewscript .= '&amp;groupid='.$groupid;
diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html
index 2970d3e9056..9e06c83ca9d 100644
--- a/mod/wiki/mod.html
+++ b/mod/wiki/mod.html
@@ -65,7 +65,7 @@
     }
 ?>
 
-<form name="form" method="post" action="<?php echo $ME ?>">
+<form name="form" method="post" action="mod.php">
 <center>
 <table cellpadding="5">
 <tr valign="top">
@@ -92,8 +92,8 @@
         else {
             choose_from_menu($WIKI_TYPES, 'wtype', $form->wtype, "");
         }
+        helpbutton('wikitype', get_string('wikitype', 'wiki'), 'wiki');
     ?>
-    <?php helpbutton('wikitype', get_string('wikitype', 'wiki'), 'wiki'); ?>
     </td>
 </tr>
 <tr valign="top">
@@ -112,8 +112,8 @@
         <?php
         $htmlmodes=array( "0" => get_string("nohtml","wiki") , "1" => get_string("safehtml","wiki"), "2" => get_string("htmlonly","wiki"));
         choose_from_menu($htmlmodes, "htmlmode", $form->htmlmode, "");
+        helpbutton('htmlmode', get_string('htmlmode', 'wiki'), 'wiki');
         ?>
-        <?php helpbutton('htmlmode', get_string('htmlmode', 'wiki'), 'wiki'); ?>
     </td>
 </tr>
 <tr valign="top">
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 1d68a062194..5a76d9ad178 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -95,7 +95,7 @@
 
         /// Build the ewsiki script constant
         /// ewbase will also be needed by EWIKI_SCRIPT_BINARY
-        $ewbase = $ME.'?id='.$moodleID;
+        $ewbase = 'view.php?id='.$moodleID;
         if (isset($userid) && $userid!=0) $ewbase .= '&amp;userid='.$userid;
         if (isset($groupid) && $groupid!=0) $ewbase .= '&amp;groupid='.$groupid;
         $ewscript = $ewbase.'&amp;page=';