Delete unused API (refs #4110)
Refactor API name (refs #4109)