Fix 'topbar'/'top-bar' naming issue. 

Addresses #3741