Route names cleanup