Fix website URL and names