fix URL and names