Clean up earlier changes.
Rename variables for new Training tab