@ fix errors and rename service file