diff --git a/app/src/main/java/org/mozilla/fenix/FenixViewModelProvider.kt b/app/src/main/java/org/mozilla/fenix/FenixViewModelProvider.kt
index 1e529681b..bfc3867e5 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixViewModelProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixViewModelProvider.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import org.mozilla.fenix.mvi.ViewState
 import org.mozilla.fenix.mvi.Change
 import org.mozilla.fenix.mvi.UIComponentViewModelBase
@@ -28,7 +27,7 @@ object FenixViewModelProvider {
 
         return object : UIComponentViewModelProvider<S, C> {
             override fun fetchViewModel(): T {
-                return ViewModelProviders.of(fragment, factory).get(modelClass)
+                return ViewModelProvider(fragment, factory).get(modelClass)
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 26f467e6a..f1ae8a80a 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -15,7 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.snackbar.Snackbar
@@ -132,7 +132,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler {
 
         getSessionById()?.let { session ->
             val viewModel = activity!!.run {
-                ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
+                ViewModelProvider(this).get(CreateCollectionViewModel::class.java)
             }
 
             val browserToolbarController = DefaultBrowserToolbarController(
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
index 05de71ef4..7664ff1f8 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
@@ -10,7 +10,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import kotlinx.android.synthetic.main.fragment_create_collection.view.*
 import kotlinx.coroutines.Dispatchers
@@ -44,7 +44,7 @@ class CreateCollectionFragment : DialogFragment() {
         val view = inflater.inflate(R.layout.fragment_create_collection, container, false)
 
         viewModel = activity!!.run {
-            ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
+            ViewModelProvider(this).get(CreateCollectionViewModel::class.java)
         }
 
         collectionCreationComponent = CollectionCreationComponent(
diff --git a/app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt b/app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt
index 7a00759c0..d84cdc672 100644
--- a/app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.components
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.get
 import mozilla.components.lib.state.Store
 
@@ -23,7 +22,7 @@ class StoreProvider<T : Store<*, *>>(
     companion object {
         fun <T : Store<*, *>> get(fragment: Fragment, createStore: () -> T): T {
             val factory = StoreProviderFactory(createStore)
-            val viewModel: StoreProvider<T> = ViewModelProviders.of(fragment, factory).get()
+            val viewModel: StoreProvider<T> = ViewModelProvider(fragment, factory).get()
             return viewModel.store
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 1c16ccfde..9ad794d5e 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -23,7 +23,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.Observer
 import androidx.lifecycle.OnLifecycleEvent
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.NavHostFragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -202,7 +202,7 @@ class HomeFragment : Fragment(), AccountObserver {
 
     private fun restoreLayoutState() {
         val homeViewModel = activity?.run {
-            ViewModelProviders.of(this).get(HomeScreenViewModel::class.java)
+            ViewModelProvider(this).get(HomeScreenViewModel::class.java)
         }
         homeViewModel?.layoutManagerState?.also { parcelable ->
             sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable)
@@ -541,7 +541,7 @@ class HomeFragment : Fragment(), AccountObserver {
         invokePendingDeleteJobs()
         super.onPause()
         val homeViewModel = activity?.run {
-            ViewModelProviders.of(this).get(HomeScreenViewModel::class.java)
+            ViewModelProvider(this).get(HomeScreenViewModel::class.java)
         }
         homeViewModel?.layoutManagerState =
             sessionControlComponent.view.layoutManager?.onSaveInstanceState()
@@ -672,7 +672,7 @@ class HomeFragment : Fragment(), AccountObserver {
         val tabs = getListOfSessions().toTabs()
 
         val viewModel = activity?.run {
-            ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
+            ViewModelProvider(this).get(CreateCollectionViewModel::class.java)
         }
         viewModel?.tabs = tabs
         val selectedTabs =