updated tabs naming per scope