diff -r classic/dbinit.py classic-fixed/dbinit.py
93c93
<                     assignedto=Link("user"), topic=Multilink("keyword"),
---
>                     assignedto=Link("user"), keyword=Multilink("keyword"),
diff -r classic/html/help_controls.js classic-fixed/html/help_controls.js
1c1
< // initial values for either Nosy, Superseder, Topic and Waiting On,
---
> // initial values for either Nosy, Superseder, Keyword and Waiting On,
55a56
>   if (document.frm_help.check==undefined) { return; }
66a68
>   if (document.frm_help.check==undefined) { return; }
78a81
>   if (document.frm_help.check==undefined) { return; }
85a89
>   if (document.frm_help.check==undefined) { return; }
102a107
>   if (document.frm_help.check==undefined) { return; }
diff -r classic/html/issue.index.html classic-fixed/html/issue.index.html
22c22
<    <th tal:condition="request/show/topic">Topic</th>
---
>    <th tal:condition="request/show/keyword">Keyword</th>
44,45c44,45
<    <td tal:condition="request/show/topic"
<        tal:content="python:i.topic.plain() or default">&nbsp;</td>
---
>    <td tal:condition="request/show/keyword"
>        tal:content="python:i.keyword.plain() or default">&nbsp;</td>
diff -r classic/html/issue.item.html classic-fixed/html/issue.item.html
63c63
<  <th nowrap>Topics</th>
---
>  <th nowrap>Keywords</th>
65,66c65,66
<   <span tal:replace="structure context/topic/field" />
<   <span tal:replace="structure python:db.keyword.classhelp(property='topic')" />
---
>   <span tal:replace="structure context/keyword/field" />
>   <span tal:replace="structure python:db.keyword.classhelp(property='keyword')" />
123c123
<  <th nowrap>Topics</th><td tal:content="structure context/topic"></td>
---
>  <th nowrap>Keywords</th><td tal:content="structure context/keyword"></td>
diff -r classic/html/issue.search.html classic-fixed/html/issue.search.html
46c46
< <tr tal:define="name string:topic;
---
> <tr tal:define="name string:keyword;
49c49
<   <th>Topic:</th>
---
>   <th>Keyword:</th>