Fix on redirects and namings