Rename functions now that they use objects instead of strings