Fix url and rename