More API consistent fix.
Merge pull request #677 from aitjcize/api-name

More API consistent fix.