Fixing url and name