Tidy up names of ThreadLocalVar files.