diff --git a/plugins/ktcore/folder/Rename.php b/plugins/ktcore/folder/Rename.php
index 12ca085..bc8104f 100644
--- a/plugins/ktcore/folder/Rename.php
+++ b/plugins/ktcore/folder/Rename.php
@@ -60,7 +60,7 @@ class KTFolderRenameAction extends KTFolderAction {
         $oTemplate->setData(array(
             'context' => &$this,
             'fields' => $fields,
-            'sFolderName' => $this->oFolder->getName(),
+            'folderName' => $this->oFolder->getName(),
         ));
         return $oTemplate->render();
     }
@@ -87,7 +87,7 @@ class KTFolderRenameAction extends KTFolderAction {
             }
         }
 
-        $res = KTDocumentUtil::rename($this->oDocument, sanitize($sFilename), $this->oUser);
+        $res = KTFolderUtil::rename($this->oFolder, sanitize($sFolderName), $this->oUser);
         if (PEAR::isError($res)) {
             $_SESSION['KTErrorMessage'][] = $res->getMessage();
             redirect(KTBrowseUtil::getUrlForFolder($this->oFolder));