rename most functions so they're consistent