Minor name cleanup
Preparing for new tab.