Tidy up names of fixtures.