diff --git a/lib/editor/coursefiles.php b/lib/editor/coursefiles.php
index 52ca32e9be1..f3d7925901c 100644
--- a/lib/editor/coursefiles.php
+++ b/lib/editor/coursefiles.php
@@ -319,7 +319,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {
diff --git a/mod/resource/coursefiles.php b/mod/resource/coursefiles.php
index 1e0705b2894..bba89b5b23e 100644
--- a/mod/resource/coursefiles.php
+++ b/mod/resource/coursefiles.php
@@ -238,7 +238,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {
diff --git a/mod/scorm/coursefiles.php b/mod/scorm/coursefiles.php
index 310e5ca9c57..2470df810b4 100755
--- a/mod/scorm/coursefiles.php
+++ b/mod/scorm/coursefiles.php
@@ -238,7 +238,8 @@
         case "rename":
             if (!empty($name)) {
                 html_header($course, $wdir);
-                $name = clean_filename($name);
+                $name    = clean_filename($name);
+                $oldname = clean_filename($oldname);
                 if (file_exists($basedir.$wdir."/".$name)) {
                     echo "Error: $name already exists!";
                 } else if (!rename($basedir.$wdir."/".$oldname, $basedir.$wdir."/".$name)) {