Rename service to factory