diff --git a/docs/upgrades/upgrade_4.8.0-4.9.0.sql b/docs/upgrades/upgrade_4.8.0-4.9.0.sql
index f20686ea5..31d9c86fb 100644
--- a/docs/upgrades/upgrade_4.8.0-4.9.0.sql
+++ b/docs/upgrades/upgrade_4.8.0-4.9.0.sql
@@ -939,4 +939,11 @@ delete from template where templateId<5 and namespace='FAQ';
 INSERT INTO template VALUES (1,'Default FAQ','<a name=\"top\"></a>\r\n<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p />\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n   <a href=\"<tmpl_var addquestion.url>\"><tmpl_var addquestion.label></a><p />\r\n</tmpl_if>\r\n\r\n<ul>\r\n<tmpl_loop qa_loop>\r\n   <li><a href=\"#<tmpl_var qa.id>\"><span class=\"faqQuestion\"><tmpl_var qa.question></span></a>\r\n</tmpl_loop>\r\n</ul>\r\n<p>\r\n\r\n\r\n<tmpl_loop qa_loop>\r\n\r\n  <tmpl_if session.var.adminOn>\r\n       <tmpl_var qa.controls>\r\n  </tmpl_if>\r\n\r\n  <a name=\"<tmpl_var qa.id>\"><span class=\"faqQuestion\"><tmpl_var qa.question></span></a><br>\r\n  <tmpl_var qa.answer>\r\n  <p/><a href=\"#top\">[top]</a><p/>\r\n</tmpl_loop>\r\n\r\n','FAQ');
 INSERT INTO template VALUES (2,'Q and A','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p />\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n   <a href=\"<tmpl_var addquestion.url>\"><tmpl_var addquestion.label></a><p />\r\n</tmpl_if>\r\n\r\n\r\n<tmpl_loop qa_loop>\r\n   <tmpl_if session.var.adminOn>\r\n     <tmpl_var qa.controls>\r\n   </tmpl_if>\r\n  <b>Q: <tmpl_var qa.question></b><br>\r\n  A: <tmpl_var qa.answer>\r\n  <p/>\r\n</tmpl_loop>\r\n\r\n','FAQ');
 INSERT INTO template VALUES (3,'Topics','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p />\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n   <a href=\"<tmpl_var addquestion.url>\"><tmpl_var addquestion.label></a><p />\r\n</tmpl_if>\r\n\r\n\r\n<tmpl_loop qa_loop>\r\n  <tmpl_if session.var.adminOn>\r\n     <tmpl_var qa.controls>\r\n   </tmpl_if>\r\n  <h2><tmpl_var qa.question></h2>\r\n  <tmpl_var qa.answer>\r\n  <p/>\r\n</tmpl_loop>\r\n\r\n','FAQ');
+delete from template where templateId<5 and namespace='Item';
+INSERT INTO template VALUES (1,'Default Item','<tmpl_if displaytitle>\r\n   <tmpl_if linkurl>\r\n       <a href=\"<tmpl_var linkurl>\">\r\n    </tmpl_if>\r\n     <span class=\"itemTitle\"><tmpl_var title></span>\r\n   <tmpl_if linkurl>\r\n      </a>\r\n    </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_if attachment.name>\r\n   <tmpl_if displaytitle> - </tmpl_if>\r\n   <a href=\"<tmpl_var attachment.url>\"><img src=\"<tmpl_var attachment.Icon>\" border=\"0\" alt=\"<tmpl_var attachment.name>\" width=\"16\" height=\"16\" border=\"0\" align=\"middle\" /></a>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n  - <tmpl_var description>\r\n</tmpl_if>','Item');
+INSERT INTO template VALUES (2,'Item w/pop-up Links','<tmpl_if displaytitle>\r\n   <tmpl_if linkurl>\r\n       <a href=\"<tmpl_var linkurl>\">\r\n    </tmpl_if>\r\n     <span class=\"itemTitle\"><tmpl_var title></span>\r\n   <tmpl_if linkurl>\r\n      </a>\r\n    </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_if attachment.name>\r\n   <tmpl_if displaytitle> - </tmpl_if>\r\n   <a href=\"<tmpl_var attachment.url>\" target=\"_blank\"><img src=\"<tmpl_var attachment.Icon>\" border=\"0\" alt=\"<tmpl_var attachment.name>\" width=\"16\" height=\"16\" border=\"0\" align=\"middle\" /></a>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n  - <tmpl_var description>\r\n</tmpl_if>','Item');
+
+
+
+
 
diff --git a/lib/WebGUI/Wobject/Item.pm b/lib/WebGUI/Wobject/Item.pm
index fc92fad57..95b680651 100644
--- a/lib/WebGUI/Wobject/Item.pm
+++ b/lib/WebGUI/Wobject/Item.pm
@@ -85,8 +85,9 @@ sub www_view {
 	my ($file, %var);
 	if ($_[0]->get("attachment") ne "") {
 		$file = WebGUI::Attachment->new($_[0]->get("attachment"),$_[0]->get("wobjectId"));
-		$var{attachmentURL} = $file->getURL;
-		$var{attachmentIcon} = $file->getIcon;
+		$var{attachment.name} = $file->getFilename;
+		$var{attachment.URL} = $file->getURL;
+		$var{attachment.Icon} = $file->getIcon;
 	}
         return $_[0]->processMacros($_[0]->processTemplate($_[0]->get("templateId"),\%var));
 }