Use resource_collection_ rate and graph now.

Keep income_graph around for backwards compatibility.