Some tab name handling and API improvements