A new batch fo simplifications.

Renamed home_url to homepage and download_url to download