diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index a0633d093..ac64f246a 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -22,17 +22,17 @@
  */
 class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 
-	/* Register a callback which removes each document from the fulltext index
+	/* Register a callback which removes each document/folder from the fulltext index
 	 * The callback must return null otherwise the removal will be canceled.
 	 */
-	static function removeFromIndex($arr, $document) { /* {{{ */
+	static function removeFromIndex($arr, $object) { /* {{{ */
 		$fulltextservice = $arr[0];
 		$lucenesearch = $fulltextservice->Search();
 		$hit = null;
-		if($document->isType('document'))
-			$hit = $lucenesearch->getDocument($document->getID());
-		elseif($document->isType('folder'))
-			$hit = $lucenesearch->getFolder($document->getID());
+		if($object->isType('document'))
+			$hit = $lucenesearch->getDocument($object->getID());
+		elseif($object->isType('folder'))
+			$hit = $lucenesearch->getFolder($object->getID());
 		if($hit) {
 			$index = $fulltextservice->Indexer();
 			$index->delete($hit->id);
@@ -55,7 +55,7 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 		$folder = $this->params['folder'];
 		$fulltextservice = $this->params['fulltextservice'];
 
-		/* Get the document id and name before removing the document */
+		/* Get the folder id and name before removing the folder */
 		$foldername = $folder->getName();
 		$folderid = $folder->getID();