diff --git a/file_echo.php b/file_echo.php
index 58ff86bdb5..5e92cb7d1b 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -28,10 +28,10 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
     $valid_match = '/^[^\n\r]*\.' . $extension . '$/';
     if (! preg_match($valid_match, $_REQUEST['filename'])) {
         if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) {
-            /* Add extension */
-            $filename = 'dowload.' . $extension;
-        } else {
             /* Filename is unsafe, discard it */
+            $filename = 'download.' . $extension;
+        } else {
+            /* Add extension */
             $filename = $_REQUEST['filename'] . '.' . $extension;
         }
     } else {
diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php
index 4b3e176d6d..748ddfe9f8 100644
--- a/test/libraries/common/PMA_expandUserString_test.php
+++ b/test/libraries/common/PMA_expandUserString_test.php
@@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase
     }
 
     /**
-     * Test case for parsing SHOW COLUNS output
+     * Test case for expanding strings
      *
      * @dataProvider provider
      */
@@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase
     }
 
     /**
-     * Test case for parsing SHOW COLUNS output
+     * Test case for expanding strings with escaping
      *
      * @dataProvider provider
      */
diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php
index d87fdbc6c6..ab789f48bc 100644
--- a/test/libraries/common/PMA_extractFieldSpec_test.php
+++ b/test/libraries/common/PMA_extractFieldSpec_test.php
@@ -19,7 +19,7 @@ require_once 'libraries/common.lib.php';
 class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase
 {
     /**
-     * Test case for parsing SHOW COLUNS output
+     * Test case for parsing SHOW COLUMNS output
      *
      * @dataProvider provider
      */