Merge "Refactor API naming and add unbundled support"