diff --git a/README.md b/README.md
index 72ece6bb1d1796e8710520ce511e480d2bcbcd00..9ee41fe0dd5710248f24c75f52a7c43a9cbd1e69 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](./LICENSE)
-[![Build Status](https://travis-ci.org/molstar/molstar-proto.svg?branch=master)](https://travis-ci.org/molstar/molstar-proto)
+[![Build Status](https://travis-ci.org/molstar/molstar.svg?branch=master)](https://travis-ci.org/molstar/molstar)
 [![Gitter](https://badges.gitter.im/molstar/Lobby.svg)](https://gitter.im/molstar/Lobby)
 
 # Mol*
diff --git a/docs/model-server/readme.md b/docs/model-server/readme.md
index 02d151c86b4e00c6a6df74844e4b8e966be62325..f091200c855656f1fb7599369fb6fc6bc679b592 100644
--- a/docs/model-server/readme.md
+++ b/docs/model-server/readme.md
@@ -8,7 +8,7 @@ Installing and Running
 
 Getting the code (use node 8+):
 ```
-git clone https://github.com/molstar/molstar-proto
+git clone https://github.com/molstar/molstar
 npm install
 ```
 
@@ -53,7 +53,7 @@ Single files:
 node build\node_modules\servers\model\preprocess -i input.cif [-oc output.cif] [-ob output.bcif] [--cfg config.json]
 ```
 
-Folder: 
+Folder:
 ```
 node build\node_modules\servers\model\preprocess -fin input_folder [-foc output_cif_folder] [-fob output_bcif_folder] [--cfg config.json]
 ```
@@ -98,7 +98,7 @@ The server can be run in local/file based mode:
 node build/node_modules/servers/model/server jobs.json
 ```
 
-where ``jobs.json`` is an array of 
+where ``jobs.json`` is an array of
 
 ```ts
 type LocalInput = {
diff --git a/mol-star-proto.sublime-project b/mol-star-proto.sublime-project
deleted file mode 100644
index 24db30311b340c8d78001f0fb705810ab77a8c38..0000000000000000000000000000000000000000
--- a/mol-star-proto.sublime-project
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"folders":
-	[
-		{
-			"path": "."
-		}
-	]
-}
diff --git a/package-lock.json b/package-lock.json
index 63217087816db2a87969dcfecf735d221decc48a..6c89b0f359c83badbc08f0ea4223fd151c4475cc 100644
Binary files a/package-lock.json and b/package-lock.json differ
diff --git a/package.json b/package.json
index f47f69c03e1099b596416415df5042401241b3be..872f07c5abd44dd4678f32ca542306892942862a 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
-  "name": "molstar-proto",
+  "name": "molstar",
   "version": "0.1.0",
-  "description": "Comprehensive molecular library.",
-  "homepage": "https://github.com/molstar/molstar-proto#readme",
+  "description": "A comprehensive macromolecular library.",
+  "homepage": "https://github.com/molstar/molstar#readme",
   "repository": {
     "type": "git",
-    "url": "https://github.com/molstar/molstar-proto.git"
+    "url": "https://github.com/molstar/molstar.git"
   },
   "bugs": {
-    "url": "https://github.com/molstar/molstar-proto/issues"
+    "url": "https://github.com/molstar/molstar/issues"
   },
   "scripts": {
     "lint": "tslint src/**/*.ts",
diff --git a/src/servers/model/test.ts b/src/servers/model/test.ts
index b250de2ef48f836723eeb758a0c62c1bc08ac847..4dd4c48d29e1cf150c135d34c1adcf26f7616e08 100644
--- a/src/servers/model/test.ts
+++ b/src/servers/model/test.ts
@@ -43,7 +43,7 @@ async function run() {
     try {
         // const testFile = '1crn.cif'
         // const testFile = '1grm_updated.cif'
-        // const testFile = 'C:/Projects/mol-star/molstar-proto/build/test/in/1grm_updated.cif'
+        // const testFile = 'C:/Projects/mol-star/molstar/build/test/in/1grm_updated.cif'
         // const request = createJob({
         //     entryId: testFile,
         //     queryName: 'full',