Fix the fixtures with consistent stop names