Change API names and comments to clarify its functionality