Some of the functions on our contracts were confusing. This commit changes them so they describe what they actually do.