rename services for consistency