more topic renaming according to new structure