diff --git a/OsmAnd-telegram/build.gradle b/OsmAnd-telegram/build.gradle
index 8235e0dc26..6f6539d48b 100644
--- a/OsmAnd-telegram/build.gradle
+++ b/OsmAnd-telegram/build.gradle
@@ -12,11 +12,13 @@ android {
     }
 
     defaultConfig {
-        applicationId "net.osmand.telegramtest"
+        applicationId "net.osmand.telegram"
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
+        versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
         versionName "1.0"
+        versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/OsmAnd-telegram/src/androidTest/java/net/osmand/telegramtest/ExampleInstrumentedTest.kt b/OsmAnd-telegram/src/androidTest/java/net/osmand/telegram/ExampleInstrumentedTest.kt
similarity index 88%
rename from OsmAnd-telegram/src/androidTest/java/net/osmand/telegramtest/ExampleInstrumentedTest.kt
rename to OsmAnd-telegram/src/androidTest/java/net/osmand/telegram/ExampleInstrumentedTest.kt
index 8655c9d631..0c433d5740 100644
--- a/OsmAnd-telegram/src/androidTest/java/net/osmand/telegramtest/ExampleInstrumentedTest.kt
+++ b/OsmAnd-telegram/src/androidTest/java/net/osmand/telegram/ExampleInstrumentedTest.kt
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("net.osmand.telegramtest", appContext.packageName)
+        assertEquals("net.osmand.telegram", appContext.packageName)
     }
 }
diff --git a/OsmAnd-telegram/src/main/AndroidManifest.xml b/OsmAnd-telegram/src/main/AndroidManifest.xml
index 44c6143c5a..512441075d 100644
--- a/OsmAnd-telegram/src/main/AndroidManifest.xml
+++ b/OsmAnd-telegram/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.osmand.telegramtest">
+    package="net.osmand.telegram">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/AndroidUtils.kt b/OsmAnd-telegram/src/main/java/net/osmand/telegram/AndroidUtils.kt
similarity index 97%
rename from OsmAnd-telegram/src/main/java/net/osmand/telegramtest/AndroidUtils.kt
rename to OsmAnd-telegram/src/main/java/net/osmand/telegram/AndroidUtils.kt
index 6796d2aae5..4c582d5a35 100644
--- a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/AndroidUtils.kt
+++ b/OsmAnd-telegram/src/main/java/net/osmand/telegram/AndroidUtils.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegramtest
+package net.osmand.telegram
 
 import android.app.Activity
 import android.content.Context
diff --git a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/LoginDialogFragment.kt b/OsmAnd-telegram/src/main/java/net/osmand/telegram/LoginDialogFragment.kt
similarity index 99%
rename from OsmAnd-telegram/src/main/java/net/osmand/telegramtest/LoginDialogFragment.kt
rename to OsmAnd-telegram/src/main/java/net/osmand/telegram/LoginDialogFragment.kt
index 60dc207f1f..48530c1b68 100644
--- a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/main/java/net/osmand/telegram/LoginDialogFragment.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegramtest
+package net.osmand.telegram
 
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
diff --git a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/MainActivity.kt b/OsmAnd-telegram/src/main/java/net/osmand/telegram/MainActivity.kt
similarity index 97%
rename from OsmAnd-telegram/src/main/java/net/osmand/telegramtest/MainActivity.kt
rename to OsmAnd-telegram/src/main/java/net/osmand/telegram/MainActivity.kt
index cf11911b15..d0c7a7d183 100644
--- a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/MainActivity.kt
+++ b/OsmAnd-telegram/src/main/java/net/osmand/telegram/MainActivity.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegramtest
+package net.osmand.telegram
 
 import android.os.Bundle
 import android.support.v4.app.Fragment
@@ -6,8 +6,8 @@ import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
-import net.osmand.telegramtest.LoginDialogFragment.LoginDialogType
-import net.osmand.telegramtest.TelegramHelper.*
+import net.osmand.telegram.LoginDialogFragment.LoginDialogType
+import net.osmand.telegram.TelegramHelper.*
 
 
 class MainActivity : AppCompatActivity(), TelegramListener {
diff --git a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/PlatformUtil.java b/OsmAnd-telegram/src/main/java/net/osmand/telegram/PlatformUtil.java
similarity index 99%
rename from OsmAnd-telegram/src/main/java/net/osmand/telegramtest/PlatformUtil.java
rename to OsmAnd-telegram/src/main/java/net/osmand/telegram/PlatformUtil.java
index 9767024ab3..958907b558 100644
--- a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/PlatformUtil.java
+++ b/OsmAnd-telegram/src/main/java/net/osmand/telegram/PlatformUtil.java
@@ -1,4 +1,4 @@
-package net.osmand.telegramtest;
+package net.osmand.telegram;
 
 import org.apache.commons.logging.Log;
 
diff --git a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/TelegramHelper.kt b/OsmAnd-telegram/src/main/java/net/osmand/telegram/TelegramHelper.kt
similarity index 99%
rename from OsmAnd-telegram/src/main/java/net/osmand/telegramtest/TelegramHelper.kt
rename to OsmAnd-telegram/src/main/java/net/osmand/telegram/TelegramHelper.kt
index 6b89f9f83b..01cfa4869f 100644
--- a/OsmAnd-telegram/src/main/java/net/osmand/telegramtest/TelegramHelper.kt
+++ b/OsmAnd-telegram/src/main/java/net/osmand/telegram/TelegramHelper.kt
@@ -1,7 +1,7 @@
-package net.osmand.telegramtest
+package net.osmand.telegram
 
 import android.text.TextUtils
-import net.osmand.telegramtest.TelegramHelper.AuthParamType.*
+import net.osmand.telegram.TelegramHelper.AuthParamType.*
 
 import org.drinkless.td.libcore.telegram.Client
 import org.drinkless.td.libcore.telegram.Client.ResultHandler
diff --git a/OsmAnd-telegram/src/test/java/net/osmand/telegramtest/ExampleUnitTest.kt b/OsmAnd-telegram/src/test/java/net/osmand/telegramtest/ExampleUnitTest.kt
index ce95b7f1e8..56a994f902 100644
--- a/OsmAnd-telegram/src/test/java/net/osmand/telegramtest/ExampleUnitTest.kt
+++ b/OsmAnd-telegram/src/test/java/net/osmand/telegramtest/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegramtest
+package net.osmand.telegram
 
 import org.junit.Test