Fix the name before using it in the URLs