fixes names and urls