Keep naming consistent

Naming should be consistent. Since there is 'Tox ID' elsewhere used already..