Change terminology from service to factory