Index: library/lib/doc-assets/entity.html.tmpl
===================================================================
diff -u -r6458c13882afd52e8719ee0e0e054b42e9aee696 -rdbddbce63d4a499de52ff07fdc63c02017960c79
--- library/lib/doc-assets/entity.html.tmpl	(.../entity.html.tmpl)	(revision 6458c13882afd52e8719ee0e0e054b42e9aee696)
+++ library/lib/doc-assets/entity.html.tmpl	(.../entity.html.tmpl)	(revision dbddbce63d4a499de52ff07fdc63c02017960c79)
@@ -1,6 +1,3 @@
-[:let packages [sorted [@package info instances] name]]
-[:let objects [sorted [@object info instances] name]]
-[:let commands [sorted [@command info instances] name]]
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns:yui="http://yuilibrary.com/rdf/1.0/yui.rdf#">
 <head>
@@ -29,7 +26,7 @@
         <a href="./index.html" title="[$project name]">[$project name]</a> 
         [:? {[:info is type ::nx::doc::@package]} {
 	   &gt; <a href="./[:filename].html" title="${:name}">${:name}</a>
-	  } ? {[:info is type ::nx::doc::@object]} {
+	  } ? {[:info is type ::nx::doc::@class]} {
 	  &gt; [:?var :partof {<a href="./[${:partof} filename].html" title="[${:partof} name]">[${:partof} name]</a> &gt;}] ${:name}</a>
 	  }]
         <form onsubmit="return false">
@@ -47,8 +44,8 @@
 			<div class="yui-b">
 			  [:? {[:info is type ::nx::doc::@package]} {
 			  [:include package.html.tmpl]
-			  } ? {[:info is type ::nx::doc::@object]} {
-			  [:include object.html.tmpl]
+			  } ? {[:info is type ::nx::doc::@class]} {
+			  [:include class.html.tmpl]
 			  } ? {[:info is type ::nx::doc::@command]} {
 			  [:include command.html.tmpl]
 			  } ? {[:info is type ::nx::doc::@project]} {
@@ -62,11 +59,11 @@
 			</div>
 			<div class="yui-b">
 			<div class="nav">
-			  [:? {$packages ne ""} {
+			  [:? {[info exists (@package)]} {
 			<div id="moduleList" class="module">
 			  <h4>Packages</h4>
 			  <ul class="content">
-			  [:for package $packages {
+			  [:for package $(@package) {
 			  [:let css "" ]
 			  [:? {[:info is type ::nx::doc::@package] && [current] eq $package} {
 			  [:let css "selected" ]
@@ -77,26 +74,26 @@
 		      </div>
 		 }]
 
-		 [:? {$objects ne ""} {
+		 [:? {[info exists (@class)]} {
 		      <div id="classList" class="module">
-			<h4>Objects</h4>
+			<h4>Classes</h4>
 			<ul class="content">
-			  [:for object $objects {
+			  [:for class $(@class) {
 			  [:let css "" ]
-			  [:? {[:info is type ::nx::doc::@object] && [current] eq $object} {
+			  [:? {[:info is type ::nx::doc::@class] && [current] eq $class} {
 			  [:let css "selected" ]
 			  }]
-			  <li class="$css"><a href="[$object filename].html" title="[$object name]">[:fit [$object name] 30]</a></li>
+			  <li class="$css"><a href="[$class filename].html" title="[$class name]">[:fit [$class name] 30]</a></li>
 			  }]
 			</ul>
 		      </div>
 		      }]
 
-		      [:? {$commands ne ""} {
+		      [:? {[info exists (@command)]} {
 		      <div id="methodsList" class="module">
 			<h4>Commands</h4>
 			<ul class="content">
-			  [:for command $commands {
+			  [:for command $(@command) {
 			  [:let css "" ]
 			  [:? {[:info is type ::nx::doc::@command] && [current] eq $command} {
 			  [:let css "selected"]
