Revert "Correct API names."
Revert "Correct API names."

This reverts commit ba4910a73baa10231bd73eb56867b1a4f0818168.
SVN revision 68909.
Author name in commit is incorrect.

SVN revision: 68911

tasn/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,rvandegrift/elementary,tasn/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,rvandegrift/elementary,FlorentRevest/Elementary