diff --git a/lib/documentmanagement/Document.inc b/lib/documentmanagement/Document.inc
index d3bd591..dcc63e5 100644
--- a/lib/documentmanagement/Document.inc
+++ b/lib/documentmanagement/Document.inc
@@ -733,8 +733,9 @@ class Document {
     */
     function getDisplayPath($bDisplayIcon = false) {
     	$sFolderPath = Folder::getFolderDisplayPath($this->iFolderID);
+    	// #3425 for consistency
         return ($bDisplayIcon ? $this->getIcon() : "") . 
-        	   ($sFolderPath == "" ? "Deleted Folder" : $sFolderPath) . " > " . $this->sName;
+        	   ($sFolderPath == "" ? "Deleted Folder" : $sFolderPath) . " > " . $this->sFileName;        	   
     }
     
     /**
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
index a592227..645d616 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
@@ -35,7 +35,8 @@ function displayDocumentPath($iDocumentID) {
 	$oDocument = Document::get($iDocumentID);
 	if ($oDocument) {
 		$iFolderID = $oDocument->getFolderID();
-		$sDocumentName = $oDocument->getName();
+		// #3425 for consistency
+		$sDocumentName = $oDocument->getFileName();
 		$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
 		$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");	    
     	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID),  "$default->rootUrl/control.php?action=browse") . " > " . $sDocumentName;
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
index 2d71665..298bcc5 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
@@ -34,11 +34,11 @@ function renderDocumentPath($oDocument, $bDisplayActions = false) {
 	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
 	$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
 	
-	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > ";	
+	$sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > ";
+	// #3425 for consistency
+	$sDocumentPath .= $oDocument->getFileName();	
 	if ($bDisplayActions) {	
-	    $sDocumentPath .= "<a onClick=\"alert('This will view a copy of the current version of this document in the DMS.  Any changes to this file will not be managed in the DMS.'); return true;\" href=\"" . generateControllerUrl("downloadDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1") . "\">" . $oDocument->getName() . "</a>";
-	} else {
-		$sDocumentPath .= $oDocument->getName();
+	    $sDocumentPath = "<a onClick=\"alert('This will view a copy of the current version of this document in the DMS.  Any changes to this file will not be managed in the DMS.'); return true;\" href=\"" . generateControllerUrl("downloadDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1") . "\">" . $sDocumentPath . "</a>";
 	}    
 	return "<table border=\"0\" cellpadding=\"5\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">$sDocumentPath</td>" . ($bDisplayActions ? "<td width=\"15%\" align=\"center\" valign=\"middle\"><strong>Actions</strong></td>" : "") . "</tr></table>\n";
 }
@@ -539,7 +539,10 @@ function displayPublishButton($oDocument, $bEdit) {
     }
 	return "<tr><td align=\"left\">"  . displayButton("viewDocument", "fDocumentID=" . $oDocument->getID() . "&fForPublish=1", "publish", $sDisabledText) . "</td></tr>\n";    
 }
-	
+
+/**
+ * Displays document action buttons
+ */
 function displayActionButtons($oDocument, $bEdit) {
     $sToRender .= displayViewButton($oDocument, $bEdit);
     $sToRender .= displayEmailButton($oDocument);