adds namespacing to service methods
updates a couple of function names now that we have namespacing