diff --git a/app/src/main/java/com/wireguard/android/ConfigListFragment.java b/app/src/main/java/com/wireguard/android/ConfigListFragment.java
index a8c8bcd4..b7460134 100644
--- a/app/src/main/java/com/wireguard/android/ConfigListFragment.java
+++ b/app/src/main/java/com/wireguard/android/ConfigListFragment.java
@@ -16,7 +16,7 @@ import android.widget.AbsListView;
 import android.widget.AdapterView;
 
 import com.wireguard.android.backends.VpnService;
-import com.wireguard.android.bindings.ObservableMapAdapter;
+import com.wireguard.android.databinding.ObservableMapAdapter;
 import com.wireguard.android.databinding.ConfigListFragmentBinding;
 import com.wireguard.config.Config;
 
diff --git a/app/src/main/java/com/wireguard/android/backends/VpnService.java b/app/src/main/java/com/wireguard/android/backends/VpnService.java
index 16596721..5002a835 100644
--- a/app/src/main/java/com/wireguard/android/backends/VpnService.java
+++ b/app/src/main/java/com/wireguard/android/backends/VpnService.java
@@ -21,8 +21,8 @@ import android.widget.Toast;
 import com.wireguard.android.NotSupportedActivity;
 import com.wireguard.android.QuickTileService;
 import com.wireguard.android.R;
-import com.wireguard.android.bindings.ObservableSortedMap;
-import com.wireguard.android.bindings.ObservableTreeMap;
+import com.wireguard.android.databinding.ObservableSortedMap;
+import com.wireguard.android.databinding.ObservableTreeMap;
 import com.wireguard.config.Config;
 import com.wireguard.config.Peer;
 
diff --git a/app/src/main/java/com/wireguard/android/bindings/BindingAdapters.java b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
similarity index 99%
rename from app/src/main/java/com/wireguard/android/bindings/BindingAdapters.java
rename to app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
index fffe191a..3e7a9270 100644
--- a/app/src/main/java/com/wireguard/android/bindings/BindingAdapters.java
+++ b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
@@ -1,4 +1,4 @@
-package com.wireguard.android.bindings;
+package com.wireguard.android.databinding;
 
 import android.databinding.BindingAdapter;
 import android.databinding.ObservableList;
diff --git a/app/src/main/java/com/wireguard/android/bindings/ItemChangeListener.java b/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java
similarity index 99%
rename from app/src/main/java/com/wireguard/android/bindings/ItemChangeListener.java
rename to app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java
index 1ee37a86..6d8debf2 100644
--- a/app/src/main/java/com/wireguard/android/bindings/ItemChangeListener.java
+++ b/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java
@@ -1,4 +1,4 @@
-package com.wireguard.android.bindings;
+package com.wireguard.android.databinding;
 
 import android.databinding.DataBindingUtil;
 import android.databinding.ObservableList;
diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableListAdapter.java b/app/src/main/java/com/wireguard/android/databinding/ObservableListAdapter.java
similarity index 98%
rename from app/src/main/java/com/wireguard/android/bindings/ObservableListAdapter.java
rename to app/src/main/java/com/wireguard/android/databinding/ObservableListAdapter.java
index 7938a2a6..5727900d 100644
--- a/app/src/main/java/com/wireguard/android/bindings/ObservableListAdapter.java
+++ b/app/src/main/java/com/wireguard/android/databinding/ObservableListAdapter.java
@@ -1,4 +1,4 @@
-package com.wireguard.android.bindings;
+package com.wireguard.android.databinding;
 
 import android.content.Context;
 import android.databinding.DataBindingUtil;
diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableMapAdapter.java b/app/src/main/java/com/wireguard/android/databinding/ObservableMapAdapter.java
similarity index 98%
rename from app/src/main/java/com/wireguard/android/bindings/ObservableMapAdapter.java
rename to app/src/main/java/com/wireguard/android/databinding/ObservableMapAdapter.java
index 8e474e47..70180728 100644
--- a/app/src/main/java/com/wireguard/android/bindings/ObservableMapAdapter.java
+++ b/app/src/main/java/com/wireguard/android/databinding/ObservableMapAdapter.java
@@ -1,4 +1,4 @@
-package com.wireguard.android.bindings;
+package com.wireguard.android.databinding;
 
 import android.content.Context;
 import android.databinding.DataBindingUtil;
diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableSortedMap.java b/app/src/main/java/com/wireguard/android/databinding/ObservableSortedMap.java
similarity index 85%
rename from app/src/main/java/com/wireguard/android/bindings/ObservableSortedMap.java
rename to app/src/main/java/com/wireguard/android/databinding/ObservableSortedMap.java
index 3317c6a7..1cbfeb6b 100644
--- a/app/src/main/java/com/wireguard/android/bindings/ObservableSortedMap.java
+++ b/app/src/main/java/com/wireguard/android/databinding/ObservableSortedMap.java
@@ -1,4 +1,4 @@
-package com.wireguard.android.bindings;
+package com.wireguard.android.databinding;
 
 import android.databinding.ObservableMap;
 
diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableTreeMap.java b/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java
similarity index 97%
rename from app/src/main/java/com/wireguard/android/bindings/ObservableTreeMap.java
rename to app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java
index 34fcab61..dc5f705b 100644
--- a/app/src/main/java/com/wireguard/android/bindings/ObservableTreeMap.java
+++ b/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java
@@ -1,4 +1,4 @@
-package com.wireguard.android.bindings;
+package com.wireguard.android.databinding;
 
 import android.databinding.MapChangeRegistry;
 import android.databinding.ObservableMap;
diff --git a/app/src/main/res/layout/config_list_fragment.xml b/app/src/main/res/layout/config_list_fragment.xml
index d4c5903e..627ecb86 100644
--- a/app/src/main/res/layout/config_list_fragment.xml
+++ b/app/src/main/res/layout/config_list_fragment.xml
@@ -7,7 +7,7 @@
         <!--suppress AndroidDomInspection -->
         <variable
             name="configs"
-            type="com.wireguard.android.bindings.ObservableSortedMap&lt;String, com.wireguard.config.Config&gt;" />
+            type="com.wireguard.android.databinding.ObservableSortedMap&lt;String, com.wireguard.config.Config&gt;" />
     </data>
 
     <RelativeLayout