Refactoring (Rename and handling url modified)