Minor api renaming for usage
Minor renaming for usage api