changed some uses of 'Services', still need to change app name