name and tab fixes