diff --git a/src/components/Home.jsx b/src/components/Home.jsx
index 663c75f11..8348cb090 100644
--- a/src/components/Home.jsx
+++ b/src/components/Home.jsx
@@ -28,13 +28,13 @@ const Home = ({ setAppsReady, wrapper }) => {
       <Main className="u-flex-grow-1">
         <ScrollToTopOnMount target={wrapper} />
         {pathname === '/connected' && <Announcements />}
-        {flag('cozy.search.enabled') && !isMobile && (
+        {flag('cozy.searchbar.enabled') && !isMobile && (
           <AssistantWrapperDesktop />
         )}
         <Content
           className={cx('u-flex u-flex-column u-ph-1', {
             [styles['homeMainContent--withAssistant']]:
-              isMobile && flag('cozy.search.enabled'),
+              isMobile && flag('cozy.searchbar.enabled'),
             [styles['homeMainContent--immersive']]:
               getFlagshipMetadata().immersive
           })}
diff --git a/src/containers/App.jsx b/src/containers/App.jsx
index e9b5a62fb..db090c5c6 100644
--- a/src/containers/App.jsx
+++ b/src/containers/App.jsx
@@ -96,8 +96,8 @@ const App = ({ accounts, konnectors, triggers }) => {
   const context = useQuery(contextQuery.definition, contextQuery.options)
 
   const showAssistantForMobile = isFlagshipApp()
-    ? flag('cozy.search.enabled-for-flagship')
-    : flag('cozy.search.enabled') && isMobile
+    ? flag('cozy.searchbar.enabled-for-flagship')
+    : flag('cozy.searchbar.enabled') && isMobile
 
   useEffect(() => {
     setIsFetching(
diff --git a/src/dataproxy/DataProxyProvider.jsx b/src/dataproxy/DataProxyProvider.jsx
index 82db17044..a60d33740 100644
--- a/src/dataproxy/DataProxyProvider.jsx
+++ b/src/dataproxy/DataProxyProvider.jsx
@@ -27,7 +27,7 @@ export const DataProxyProvider = React.memo(({ children }) => {
 
     const initIframe = async () => {
       try {
-        if (!flag('cozy.search.with-result')) {
+        if (!flag('cozy.search.enabled')) {
           log.log(
             'Dataproxy features will be disabled due to missing feature flags'
           )