Rename service and format code