Standardized names for easier updating

Also updated sponsorship guide