Improve APIs naming conventions and verbosity
Improve APIs naming conventions and verbosity