Delete unused API (refs #4110)
Refactor API name (refs #4109)
Merge pull request #917 from thingthing/3.2-A4109

Refactor API (closes #4110 closes #4109)