Problem: Inconsistent Naming

* continuing refactor of API names for consistency.