Change some names to reflect cleaner API