Also changed some function names to attempt to guarantee uniqueness across API files. MozReview-Commit-ID: GnwWwTADF3a
MozReview-Commit-ID: KhupGnBT5mZ