Refactoring of API names to be more abstract