diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt
index e9efc307..26db56dd 100644
--- a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt
@@ -2,8 +2,8 @@ package com.adevinta.android.barista.assertion
 
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import com.adevinta.android.barista.internal.assertAny
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import com.adevinta.android.barista.internal.util.resourceMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
 import org.hamcrest.Matchers.not
 
 object BaristaCheckedAssertions {
diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt
index c091a961..fa9011bd 100644
--- a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt
@@ -3,7 +3,7 @@ package com.adevinta.android.barista.assertion
 import androidx.test.espresso.matcher.ViewMatchers.isClickable
 import com.adevinta.android.barista.internal.assertAny
 import com.adevinta.android.barista.internal.util.resourceMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import org.hamcrest.Matchers.not
 
 object BaristaClickableAssertions {
diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt
index 6c4988b0..70e0d3de 100644
--- a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt
@@ -3,7 +3,7 @@ package com.adevinta.android.barista.assertion
 import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import com.adevinta.android.barista.internal.assertAny
 import com.adevinta.android.barista.internal.util.resourceMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import org.hamcrest.Matchers.not
 
 object BaristaEnabledAssertions {
diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt
index 3fc0906c..70e47549 100644
--- a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt
@@ -4,7 +4,7 @@ import androidx.annotation.IdRes
 import androidx.test.espresso.matcher.ViewMatchers.hasFocus
 import com.adevinta.android.barista.internal.assertAny
 import com.adevinta.android.barista.internal.util.resourceMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import org.hamcrest.Matchers.not
 
 object BaristaFocusedAssertions {
diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt
index e737924d..0aa07e62 100644
--- a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt
@@ -15,7 +15,7 @@ import com.adevinta.android.barista.internal.assertAny
 import com.adevinta.android.barista.internal.matcher.TextColorMatcher
 import com.adevinta.android.barista.internal.matcher.TextStyleableColorMatcher
 import com.adevinta.android.barista.internal.util.resourceMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt
index 99aa0b9c..820a5e93 100644
--- a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt
@@ -5,7 +5,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.longClick
 import com.adevinta.android.barista.internal.performAction
 import com.adevinta.android.barista.internal.util.resourceMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 
 object BaristaClickInteractions {
 
diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt
index 2a36617b..5e272551 100644
--- a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt
@@ -16,7 +16,7 @@ import com.adevinta.android.barista.internal.failurehandler.SpyFailureHandler
 import com.adevinta.android.barista.internal.failurehandler.withFailureHandler
 import com.adevinta.android.barista.internal.matcher.DisplayedMatchers.displayedAnd
 import com.adevinta.android.barista.internal.matcher.HelperMatchers.menuIdMatcher
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.hasToString
 
diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt
index af7c5ac3..96aa54af 100644
--- a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt
@@ -6,7 +6,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import com.adevinta.android.barista.internal.matcher.HelperMatchers.withParentId
 import com.adevinta.android.barista.internal.performAction
-import com.schibsted.spain.barista.internal.matcher.withCompatText
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import org.hamcrest.Matchers.allOf
 
 object BaristaRadioButtonInteractions {
diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt
index 60f25e38..a7b2c348 100644
--- a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt
+++ b/library/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt
@@ -5,9 +5,9 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.PerformException
 import com.adevinta.android.barista.internal.failurehandler.SpyFailureHandler
 import com.adevinta.android.barista.internal.failurehandler.description
+import com.adevinta.android.barista.internal.matcher.withCompatText
 import com.adevinta.android.barista.internal.util.resourceMatcher
 import com.adevinta.android.barista.internal.viewaction.NestedEnabledScrollToAction.nestedScrollToAction
-import com.schibsted.spain.barista.internal.matcher.withCompatText
 import org.hamcrest.Matcher
 
 /**