diff --git a/README.md b/README.md
index bdb129538dc85f162143830d03da257136e2d460..53d2f0e962a7e5657600368515c25cfcbccc462f 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# c-server
+# C-Service
 
 [![License](https://img.shields.io/badge/license-MIT-green)](https://opensource.org/licenses/MIT)
-[![pipeline status](https://gitlab.inria.fr/concordant/software/c-server/badges/master/pipeline.svg)](https://gitlab.inria.fr/concordant/software/c-server/-/commits/master)
-[![coverage report](https://gitlab.inria.fr/concordant/software/c-server/badges/master/coverage.svg)](https://gitlab.inria.fr/concordant/software/c-server/-/commits/master)
+[![pipeline status](https://gitlab.inria.fr/concordant/software/c-service/badges/master/pipeline.svg)](https://gitlab.inria.fr/concordant/software/c-service/-/commits/master)
+[![coverage report](https://gitlab.inria.fr/concordant/software/c-service/badges/master/coverage.svg)](https://gitlab.inria.fr/concordant/software/c-service/-/commits/master)
 
-Server code for the C-Labbook demo.
+Service code for the C-Labbook demo.
 The first version of C-Service API.
 
 ## Getting started
@@ -15,7 +15,7 @@ For the next steps, you will need the following software:
 
 - Make sure you have the latest version of Node.js: [see official installation guide](https://nodejs.org/en/download/);
 - The project uses Git to download some required dependencies: [follow the official install guide](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-- C-Server runs on top of CouchDB, [see CouchDB's installation guide](https://docs.couchdb.org/en/stable/install/index.html)
+- C-Service runs on top of CouchDB, [see CouchDB's installation guide](https://docs.couchdb.org/en/stable/install/index.html)
 
 In addition, you will need to enable CORS in CouchDB
 
@@ -31,9 +31,9 @@ Go to project root directory and:
 npm install
 ```
 
-2.**Start C-Server**
+2.**Start C-Service**
 
-Set database name and credentials and run server:
+Set database name and credentials and run service:
 
 ```bash
 export DBNAME=my-database COUCHDB_USER=my-user COUCHDB_PASSWORD=my-passwd
diff --git a/package.json b/package.json
index af899a3462b54a0ad5bb57752711a4b241becc7a..238e25b06503ed70fdfec414c91436e8086dd21e 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "c-server",
+  "name": "c-service",
   "version": "1.1.1",
   "description": "Server backend for Concordant P2P collaborative apps",
   "main": "./dist/main.js",
@@ -8,7 +8,7 @@
     "dist/**/*"
   ],
   "scripts": {
-    "start": "babel-node dist/server.js",
+    "start": "babel-node dist/service.js",
     "test": "jest $TESTS",
     "lint": "eslint .",
     "build": "tsc --skipLibCheck",
@@ -16,14 +16,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.inria.fr/concordant/software/c-server.git"
+    "url": "git+https://gitlab.inria.fr/concordant/software/c-service.git"
   },
   "author": "info@concordant.io",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.inria.fr/concordant/software/c-server/issues"
+    "url": "https://gitlab.inria.fr/concordant/software/c-service/issues"
   },
-  "homepage": "https://gitlab.inria.fr/concordant/software/c-server/-/blob/master/README.md",
+  "homepage": "https://gitlab.inria.fr/concordant/software/c-service/-/blob/master/README.md",
   "devDependencies": {
     "@babel/core": "^7.6.0",
     "@babel/node": "^7.6.1",
diff --git a/src/server.ts b/src/service.ts
similarity index 100%
rename from src/server.ts
rename to src/service.ts