Fixes name and urls