Namefix.
Topic fix.
Fix for #7365.