Cleanup

Cleaned up the addNames() function by moving the creative tab part to
another function.