More renames.
Never hardcode URLs.