diff --git a/.gitignore b/.gitignore
index a58f683e..6d6970cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Github
+.fork/
+
 # Idea
 **/*.iml
 .idea/
diff --git a/sample/build.gradle b/sample/build.gradle
index 16d27fb6..bacf07fb 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
     androidTestImplementation "androidx.test:runner:$runnerVersion"
     androidTestImplementation "androidx.test:rules:$runnerVersion"
-    androidTestImplementation('com.schibsted.spain:barista:3.7.0') {
+    androidTestImplementation('com.adevinta.android:barista:3.10.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
 }
diff --git a/sample/src/androidTest/AndroidManifest.xml b/sample/src/androidTest/AndroidManifest.xml
index b81f1910..15b85903 100644
--- a/sample/src/androidTest/AndroidManifest.xml
+++ b/sample/src/androidTest/AndroidManifest.xml
@@ -2,6 +2,6 @@
 <manifest xmlns:tools="http://schemas.android.com/tools"
     package="com.esafirm.sample">
 
-    <uses-sdk tools:overrideLibrary="com.schibsted.spain.barista,android_libs.ub_uiautomator" />
+    <uses-sdk tools:overrideLibrary="com.adevinta.android.barista,android_libs.ub_uiautomator" />
 
 </manifest>
diff --git a/sample/src/androidTest/java/com/esafirm/sample/CameraOnPickerTest.kt b/sample/src/androidTest/java/com/esafirm/sample/CameraOnPickerTest.kt
index bc2722e9..89ea64e3 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/CameraOnPickerTest.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/CameraOnPickerTest.kt
@@ -11,9 +11,9 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.schibsted.spain.barista.intents.BaristaIntents.mockAndroidCamera
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions
+import com.adevinta.android.barista.intents.BaristaIntents.mockAndroidCamera
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/sample/src/androidTest/java/com/esafirm/sample/CameraOnlyTest.kt b/sample/src/androidTest/java/com/esafirm/sample/CameraOnlyTest.kt
index 158225f9..58bd5ff1 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/CameraOnlyTest.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/CameraOnlyTest.kt
@@ -18,9 +18,9 @@ import androidx.test.runner.AndroidJUnit4
 import com.esafirm.sample.matchers.hasDrawable
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
-import com.schibsted.spain.barista.intents.BaristaIntents.mockAndroidCamera
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.intents.BaristaIntents.mockAndroidCamera
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt b/sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt
index 7133c6ab..0a63d3d1 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/CustomUiTest.kt
@@ -11,7 +11,7 @@ import androidx.test.rule.GrantPermissionRule
 import androidx.test.runner.AndroidJUnit4
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
index 15c8f11f..e3d7a20d 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
@@ -10,7 +10,7 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageFragmentTest.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageFragmentTest.kt
index 1ddac9c4..aa37571e 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/PickImageFragmentTest.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/PickImageFragmentTest.kt
@@ -8,9 +8,9 @@ import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.esafirm.sample.utils.Views
-import com.schibsted.spain.barista.assertion.BaristaImageViewAssertions.assertHasAnyDrawable
-import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.assertion.BaristaImageViewAssertions.assertHasAnyDrawable
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -43,4 +43,4 @@ class PickImageFragmentTest {
         assertHasAnyDrawable(R.id.img_fragment)
     }
 
-}
\ No newline at end of file
+}
diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageSingleTest.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageSingleTest.kt
index 5168308c..4e199f6f 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/PickImageSingleTest.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/PickImageSingleTest.kt
@@ -10,7 +10,7 @@ import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith