Changed internal references to service