diff --git a/README.md b/README.md
index 09b82d3..58be30d 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ termius sync ssh
 ## License
 
 
-Please see [LICENSE](https://github.com/Crystalnix/serverauditor-sshconfig/blob/master/LICENSE).
+Please see [LICENSE](https://github.com/Crystalnix/termius-cli/blob/master/LICENSE).
 
 
 ## Notes
diff --git a/bin/serverauditor b/bin/serverauditor
deleted file mode 100644
index cd76f4e..0000000
--- a/bin/serverauditor
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from termius.main import main
-main()
diff --git a/bootstrap.sh b/bootstrap.sh
index 6ee4193..4c4c43c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-tar_url='https://github.com/Crystalnix/serverauditor-sshconfig/archive/master.zip'
+tar_url='https://github.com/Crystalnix/termius-cli/archive/master.zip'
 
 command_exists() {
     command -v "$@" > /dev/null 2>&1
diff --git a/docker-compose.yml b/docker-compose.yml
index 0efacdd..a4fe6f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 cli:
   build: .
   environment:
-    SERVERAUDITOR_USERNAME:
-    SERVERAUDITOR_PASSWORD:
+    TERMIUS_USERNAME:
+    TERMIUS_PASSWORD:
diff --git a/setup.py b/setup.py
index 03c5b70..651df80 100644
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@ def get_long_description():
     license='BSD',
     author='Crystalnix',
     author_email='contacts@crystalnix.com',
-    url='https://github.com/Crystalnix/serverauditor-sshconfig',
+    url='https://github.com/Crystalnix/termius-cli',
     description='Termius ssh-config utility.',
     long_description=get_long_description(),
     keywords=['termius', 'crystalnix'],
diff --git a/tests/integration/fullclean.bats b/tests/integration/fullclean.bats
index fc42a75..9b6c673 100644
--- a/tests/integration/fullclean.bats
+++ b/tests/integration/fullclean.bats
@@ -13,9 +13,9 @@ load test_helper
 
 @test "fullclean logged in" {
     login_termius
-    termius pull -p $SERVERAUDITOR_PASSWORD
+    termius pull -p $TERMIUS_PASSWORD
 
-    run termius fullclean -p $SERVERAUDITOR_PASSWORD
+    run termius fullclean -p $TERMIUS_PASSWORD
     [ "$status" -eq 0 ]
     assert_clear_storage
 }
diff --git a/tests/integration/login.bats b/tests/integration/login.bats
index f5e9bcc..a45bfca 100644
--- a/tests/integration/login.bats
+++ b/tests/integration/login.bats
@@ -12,26 +12,26 @@ load test_helper
 }
 
 @test "log into tester account" {
-    if [ "$SERVERAUDITOR_USERNAME" == '' ] || [ "$SERVERAUDITOR_PASSWORD" == '' ];then
-        skip '$SERVERAUDITOR_USERNAME or $SERVERAUDITOR_PASSWORD are not set!'
+    if [ "$TERMIUS_USERNAME" == '' ] || [ "$TERMIUS_PASSWORD" == '' ];then
+        skip '$TERMIUS_USERNAME or $TERMIUS_PASSWORD are not set!'
     fi
     rm ~/.termius/config || true
 
-    run termius login --username $SERVERAUDITOR_USERNAME -p $SERVERAUDITOR_PASSWORD
+    run termius login --username $TERMIUS_USERNAME -p $TERMIUS_PASSWORD
     [ "$status" -eq 0 ]
     ! [ -z "$(cat ~/.termius/config)" ]
 }
 
 @test "Change tester account" {
-    if [ "$SERVERAUDITOR_USERNAME" == '' ] || [ "$SERVERAUDITOR_PASSWORD" == '' ] ||
-        [ "$SERVERAUDITOR_USERNAME_2" == '' ] || [ "$SERVERAUDITOR_PASSWORD_2" == '' ] ;then
-        skip '$SERVERAUDITOR_USERNAME or $SERVERAUDITOR_PASSWORD or $SERVERAUDITOR_USERNAME_2 or $SERVERAUDITOR_PASSWORD_2 are not set!'
+    if [ "$TERMIUS_USERNAME" == '' ] || [ "$TERMIUS_PASSWORD" == '' ] ||
+        [ "$TERMIUS_USERNAME_2" == '' ] || [ "$TERMIUS_PASSWORD_2" == '' ] ;then
+        skip '$TERMIUS_USERNAME or $TERMIUS_PASSWORD or $TERMIUS_USERNAME_2 or $TERMIUS_PASSWORD_2 are not set!'
     fi
     rm ~/.termius/config || true
 
-    termius login --username $SERVERAUDITOR_USERNAME -p $SERVERAUDITOR_PASSWORD
+    termius login --username $TERMIUS_USERNAME -p $TERMIUS_PASSWORD
     populate_storage
-    run termius login --username $SERVERAUDITOR_USERNAME_2 -p $SERVERAUDITOR_PASSWORD_2
+    run termius login --username $TERMIUS_USERNAME_2 -p $TERMIUS_PASSWORD_2
     [ "$status" -eq 0 ]
     ! [ -z "$(cat ~/.termius/config)" ]
     assert_clear_storage
diff --git a/tests/integration/pull.bats b/tests/integration/pull.bats
index aa37eb0..a5202a8 100644
--- a/tests/integration/pull.bats
+++ b/tests/integration/pull.bats
@@ -19,7 +19,7 @@ setup() {
 @test "pull logged in" {
     login_termius
 
-    run termius pull -p $SERVERAUDITOR_PASSWORD
+    run termius pull -p $TERMIUS_PASSWORD
     [ "$status" -eq 0 ]
 }
 
diff --git a/tests/integration/push.bats b/tests/integration/push.bats
index b7657cc..423579e 100644
--- a/tests/integration/push.bats
+++ b/tests/integration/push.bats
@@ -18,8 +18,8 @@ setup() {
 @test "push logged in" {
     login_termius
 
-    termius pull -p $SERVERAUDITOR_PASSWORD
-    run termius push -p $SERVERAUDITOR_PASSWORD
+    termius pull -p $TERMIUS_PASSWORD
+    run termius push -p $TERMIUS_PASSWORD
     [ "$status" -eq 0 ]
 }
 
diff --git a/tests/integration/test_helper.bash b/tests/integration/test_helper.bash
index 98afbda..8a34361 100644
--- a/tests/integration/test_helper.bash
+++ b/tests/integration/test_helper.bash
@@ -1,15 +1,15 @@
 login_termius () {
-    if [ "$SERVERAUDITOR_USERNAME" == '' ] || [ "$SERVERAUDITOR_PASSWORD" == '' ];then
-      skip '$SERVERAUDITOR_USERNAME and $SERVERAUDITOR_PASSWORD are not set!'
+    if [ "$TERMIUS_USERNAME" == '' ] || [ "$TERMIUS_PASSWORD" == '' ];then
+      skip '$TERMIUS_USERNAME and $TERMIUS_PASSWORD are not set!'
     fi
 
-    termius login --username $SERVERAUDITOR_USERNAME -p $SERVERAUDITOR_PASSWORD
+    termius login --username $TERMIUS_USERNAME -p $TERMIUS_PASSWORD
 }
 
 pull_termius() {
     login_termius
 
-    termius pull -p $SERVERAUDITOR_PASSWORD
+    termius pull -p $TERMIUS_PASSWORD
 
 }