Rename classes to better match API names