Rename services to service