change name & fix tab