Fix town names