It would be worth making sure this really is a change we need to make. Can the original reporter explain why one is more appropriate than the other in terms of Sphinx doc for ​topic and ​rubric? Just to make sure :)