Remove remaining references to "tabs" - part I
Remove remaining references to "tabs" - part II