replaced some 'api' strings by the according service