diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 37dfd83..c0fa5ee 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,7 @@
+v2.1.1
+Fixed Android build
+Switched versioning format
+
 v2.0.7
 Switched from WebView to API
 Updated app to latest Flutter
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e8883bd..1bb5000 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -43,7 +43,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "xyz.dcdevelop.info_tren"
+        applicationId "xyz.dcdevelop.infotren"
         minSdkVersion 16
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index e798ce8..14bf51c 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="xyz.dcdevelop.info_tren">
+    package="xyz.dcdevelop.infotren">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt b/android/app/src/main/kotlin/xyz/dcdevelop/infotren/MainActivity.kt
similarity index 75%
rename from android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt
rename to android/app/src/main/kotlin/xyz/dcdevelop/infotren/MainActivity.kt
index 0fd345f..d3571c7 100644
--- a/android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt
+++ b/android/app/src/main/kotlin/xyz/dcdevelop/infotren/MainActivity.kt
@@ -1,4 +1,4 @@
-package xyz.dcdevelop.info_tren
+package xyz.dcdevelop.infotren
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 497e59a..736f26a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: O aplicație de vizualizare a datelor puse la dispoziție de Inform
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.0.7
+version: 2.1.1
 
 environment:
   sdk: ">=2.12.0 <3.0.0"