One point to be made from all of this. Any changes made need to keep as much of the present structure as possible. Renaming drag tostraight line and nascar to oval is one thing. Trying to combine everything into one place now with all the tasks would be a huge undertaking.
I've had experience working with databases and know the amount of work for big changes.