refactor names and update api-doc