Fixed namespacing on base API