Fix urls and names