Renamed the 'Topic' and 'Subtopic' classes.