diff --git a/scripts/core/deploy_release.sh b/scripts/core/deploy_release.sh
index 9b43dc5..a5cac3d 100755
--- a/scripts/core/deploy_release.sh
+++ b/scripts/core/deploy_release.sh
@@ -12,6 +12,9 @@ fi
 
 source ./setup-variables.sh
 FALLBACK_API_TYPE="sealed"
+SAFE_VERSION_NAME="v4_0_${REVISION}"
+REVISION_SUFFIX=""
+REVISION_MVN="4.0.${REVISION}${REVISION_SUFFIX}"
 
 if [ -z "${API_TYPE}" ]; then
 	cd ../../generated
@@ -19,7 +22,7 @@ else
 	cd "../../generated-${API_TYPE}"
 fi
 
-mvn -B -DrevisionNumber="${REVISION}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" -DrevisionSuffix="" clean deploy
+mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" clean deploy
 
 echo "Done."
 exit 0
diff --git a/scripts/core/deploy_snapshot.sh b/scripts/core/deploy_snapshot.sh
index ab8a254..c5b328b 100755
--- a/scripts/core/deploy_snapshot.sh
+++ b/scripts/core/deploy_snapshot.sh
@@ -9,8 +9,11 @@ else
 fi
 
 FALLBACK_API_TYPE="sealed"
+SAFE_VERSION_NAME="v4_0_0"
+REVISION_SUFFIX="-SNAPSHOT"
+REVISION_MVN="4.0.0${REVISION_SUFFIX}"
 
-mvn -B "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy
+mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy
 
 echo "Done."
 exit 0
diff --git a/src/main/jni-project-src/pom.template.xml b/src/main/jni-project-src/pom.template.xml
index c030189..d7c72ae 100644
--- a/src/main/jni-project-src/pom.template.xml
+++ b/src/main/jni-project-src/pom.template.xml
@@ -3,13 +3,13 @@
 	<groupId>it.tdlight</groupId>
 	<artifactId>${IMPLEMENTATION_NAME}-natives-${OPERATING_SYSTEM_NAME}-${CPU_ARCHITECTURE_NAME}</artifactId>
   <!-- Don't change the version! (or change it also in <shadedPattern>) -->
-	<version>4.0.${revisionNumber}${revisionSuffix}</version>
+	<version>${revision}</version>
 	<name>${IMPLEMENTATION_NAME} natives for ${OPERATING_SYSTEM_NAME} (${CPU_ARCHITECTURE_NAME})</name>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revisionNumber>0</revisionNumber>
-    <revisionSuffix>-SNAPSHOT</revisionSuffix>
+		<revision>4.0.0-SNAPSHOT</revision>
+		<safeVersionName>v4_0_0</safeVersionName>
 	</properties>
 	<distributionManagement>
 		<repository>
@@ -87,7 +87,7 @@
 							<relocations>
 								<relocation>
 									<pattern>it.tdlight.jni.implementation_name.operating_system_name.cpu_architecture_name.version</pattern>
-									<shadedPattern>it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}.${CPU_ARCHITECTURE_NAME}.v4_0_${revisionNumber}</shadedPattern>
+									<shadedPattern>it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}.${CPU_ARCHITECTURE_NAME}.${safeVersionName}</shadedPattern>
 								</relocation>
 							</relocations>
 						</configuration>
diff --git a/src/main/tdapi-project-src/pom.template.xml b/src/main/tdapi-project-src/pom.template.xml
index 78c15ea..d18e41b 100644
--- a/src/main/tdapi-project-src/pom.template.xml
+++ b/src/main/tdapi-project-src/pom.template.xml
@@ -2,13 +2,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>it.tdlight</groupId>
 	<artifactId>${IMPLEMENTATION_NAME}-api-${API_TYPE}</artifactId>
-  <version>4.0.${revisionNumber}${revisionSuffix}</version>
+  <version>${revision}</version>
 	<name>${IMPLEMENTATION_NAME} API</name>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revisionNumber>0</revisionNumber>
-    <revisionSuffix>-SNAPSHOT</revisionSuffix>
+		<revision>4.0.0-SNAPSHOT</revision>
+		<safeVersionName>v4_0_0</safeVersionName>
 	</properties>
 	<profiles>
 		<profile>