diff --git a/ViewTickets.md b/ViewTickets.md
index a8d956b..5f51f16 100644
--- a/ViewTickets.md
+++ b/ViewTickets.md
@@ -45,13 +45,13 @@ See [ComponentDefinitions](ComponentDefinitions) for an explanation of what each
  * [forward-compatibility]query:status!=closed&keywords~=forward-compatibility ([count)](TicketQuery)(status!=closed&keywords~=forward-compatibility,): relevant to [forward compatibility](http://en.wikipedia.org/wiki/Forward_compatibility) of stored data or caps with future Tahoe versions
  * [unicode]query:status!=closed&keywords~=unicode ([count)](TicketQuery)(status!=closed&keywords~=unicode,): related to Unicode
  * [i18n]query:status!=closed&keywords~=i18n ([count)](TicketQuery)(status!=closed&keywords~=i18n,): related to internationalization (usually also to Unicode)
- * [usability]query:status!=closed&keywords~=usability ([count)](TicketQuery)(status!=closed&keywords~=usability,): concerned with ease of use (concerning interface or mental models)
+ * [usability]query:status!=closed&keywords~=usability ([count)](TicketQuery)(status!=closed&keywords~=usability,): concerned with ease of use (interface or mental models)
  * [install]query:status!=closed&keywords~=install ([count)](TicketQuery)(status!=closed&keywords~=install,): installation problems
  * [docs]query:status!=closed&keywords~=docs ([count)](TicketQuery)(status!=closed&keywords~=docs,): fixing this issue involves updating documentation
  * [performance]query:status!=closed&keywords~=performance ([count)](TicketQuery)(status!=closed&keywords~=performance,): an opportunity to improve some aspect of performance (speed, latency, bandwidth, space usage, etc.)
  * [memory]query:status!=closed&keywords~=memory ([count)](TicketQuery)(status!=closed&keywords~=memory,): an opportunity to improve memory usage (should usually also be tagged as 'performance')
  * [newcaps]query:status!=closed&keywords~=newcaps ([count)](TicketQuery)(status!=closed&keywords~=newcaps,): relevant to [NewCapDesign](NewCapDesign)
- * [firewall]query:status!=closed&keywords~=firewall ([count)](TicketQuery)(status!=closed&keywords~=firewall,): relevant to firewall and NAT issues
+ * [firewall]query:status!=closed&keywords~=firewall ([count)](TicketQuery)(status!=closed&keywords~=firewall,): firewall and NAT traversal issues
 
 Combined queries:
  * [tickets tagged 'integrity', 'confidentiality', 'privacy' or 'security']query:status!=closed&keywords~=integrity|confidentiality|privacy|security ([confidentiality|privacy|security, count)](TicketQuery)(status!=closed&keywords~=integrity)
@@ -71,13 +71,7 @@ Combined queries:
  * [ppc]query:status!=closed&keywords~=ppc ([count)](TicketQuery)(status!=closed&keywords~=ppc,): PowerPC processors
  * [arm]query:status!=closed&keywords~=arm ([count)](TicketQuery)(status!=closed&keywords~=arm,): ARM processors
 
-# Component keywords
- * [pycryptopp]query:status!=closed&keywords~=pycryptopp ([count)](TicketQuery)(status!=closed&keywords~=pycryptopp,): pycryptopp library
- * [zfec]query:status!=closed&keywords~=zfec ([count)](TicketQuery)(status!=closed&keywords~=zfec,): zfec library
- * [foolscap]query:status!=closed&keywords~=foolscap ([count)](TicketQuery)(status!=closed&keywords~=foolscap,): foolscap library
- * [openssl]query:status!=closed&keywords~=openssl ([count)](TicketQuery)(status!=closed&keywords~=openssl,): openssl library
- * [twisted]query:status!=closed&keywords~=twisted ([count)](TicketQuery)(status!=closed&keywords~=twisted,): twisted library
- * [setuptools]query:status!=closed&keywords~=setuptools ([count)](TicketQuery)(status!=closed&keywords~=setuptools,): setuptools/zetuptoolz packaging
+# Functionality
  * [helper]query:status!=closed&keywords~=helper ([count)](TicketQuery)(status!=closed&keywords~=helper,): related to helper function
  * [repair]query:status!=closed&keywords~=repair ([count)](TicketQuery)(status!=closed&keywords~=repair,): related to repair function
  * [introducer]query:status!=closed&keywords~=introducer ([count)](TicketQuery)(status!=closed&keywords~=introducer,): related to introducer function
@@ -92,6 +86,14 @@ Combined queries:
  * [tahoe-rm]query:status!=closed&keywords~=tahoe-rm ([count)](TicketQuery)(status!=closed&keywords~=tahoe-rm,): `tahoe rm` command
  * [tahoe-backup]query:status!=closed&keywords~=tahoe-backup ([count)](TicketQuery)(status!=closed&keywords~=tahoe-backup,): `tahoe backup` command
 
+# Dependencies
+ * [pycryptopp]query:status!=closed&keywords~=pycryptopp ([count)](TicketQuery)(status!=closed&keywords~=pycryptopp,): pycryptopp library
+ * [zfec]query:status!=closed&keywords~=zfec ([count)](TicketQuery)(status!=closed&keywords~=zfec,): zfec library
+ * [foolscap]query:status!=closed&keywords~=foolscap ([count)](TicketQuery)(status!=closed&keywords~=foolscap,): foolscap library
+ * [openssl]query:status!=closed&keywords~=openssl ([count)](TicketQuery)(status!=closed&keywords~=openssl,): openssl library
+ * [twisted]query:status!=closed&keywords~=twisted ([count)](TicketQuery)(status!=closed&keywords~=twisted,): twisted library
+ * [setuptools]query:status!=closed&keywords~=setuptools ([count)](TicketQuery)(status!=closed&keywords~=setuptools,): setuptools/zetuptoolz packaging
+
 # Tickets by Milestone
  * [1.6.0]query:milestone=1.6.0&status!=closed ([count)](TicketQuery)(milestone=1.6.0&status!=closed,)
  * [eventually]query:milestone=eventually&status!=closed ([count)](TicketQuery)(milestone=eventually&status!=closed,)