diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
index 686085e13..860951467 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
@@ -57,7 +57,7 @@ import org.tasks.themes.ThemeColor
 import org.tasks.ui.DeadlineControlSet.DueDateChangeListener
 import org.tasks.ui.EmptyTaskEditFragment.Companion.newEmptyTaskEditFragment
 import org.tasks.ui.NavigationDrawerFragment
-import org.tasks.ui.RemoteListFragment.OnListChanged
+import org.tasks.ui.ListFragment.OnListChanged
 import org.tasks.ui.TaskListViewModel
 import javax.inject.Inject
 
@@ -434,7 +434,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
         taskEditFragment!!.onDueDateChanged(dateTime)
     }
 
-    override fun onListchanged(filter: Filter?) {
+    override fun onListChanged(filter: Filter?) {
         taskEditFragment!!.onRemoteListChanged(filter)
     }
 
diff --git a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
index ee0d731a4..ac26a9d91 100644
--- a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
+++ b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
@@ -26,7 +26,7 @@ import org.tasks.ui.DeadlineControlSet;
 import org.tasks.ui.DescriptionControlSet;
 import org.tasks.ui.LocationControlSet;
 import org.tasks.ui.PriorityControlSet;
-import org.tasks.ui.RemoteListFragment;
+import org.tasks.ui.ListFragment;
 import org.tasks.ui.SubtaskControlSet;
 import org.tasks.ui.TaskEditControlFragment;
 
@@ -64,7 +64,7 @@ public class TaskEditControlSetFragmentManager {
         TagsControlSet.TAG,
         RepeatControlSet.TAG,
         CommentBarFragment.TAG,
-        RemoteListFragment.TAG,
+        ListFragment.TAG,
         SubtaskControlSet.TAG
       };
 
@@ -157,8 +157,8 @@ public class TaskEditControlSetFragmentManager {
         return new RepeatControlSet();
       case CommentBarFragment.TAG:
         return new CommentBarFragment();
-      case RemoteListFragment.TAG:
-        return new RemoteListFragment();
+      case ListFragment.TAG:
+        return new ListFragment();
       case SubtaskControlSet.TAG:
         return new SubtaskControlSet();
       default:
diff --git a/app/src/main/java/org/tasks/injection/FragmentComponent.kt b/app/src/main/java/org/tasks/injection/FragmentComponent.kt
index 35e59f68a..d5111c3d2 100644
--- a/app/src/main/java/org/tasks/injection/FragmentComponent.kt
+++ b/app/src/main/java/org/tasks/injection/FragmentComponent.kt
@@ -29,7 +29,7 @@ interface FragmentComponent {
     fun inject(fragment: DescriptionControlSet)
     fun inject(fragment: CalendarControlSet)
     fun inject(fragment: TaskListFragment)
-    fun inject(fragment: RemoteListFragment)
+    fun inject(fragment: ListFragment)
     fun inject(fragment: LocationControlSet)
     fun inject(fragment: SubtaskControlSet)
     fun inject(fragment: TaskListViewModel)
diff --git a/app/src/main/java/org/tasks/ui/RemoteListFragment.kt b/app/src/main/java/org/tasks/ui/ListFragment.kt
similarity index 98%
rename from app/src/main/java/org/tasks/ui/RemoteListFragment.kt
rename to app/src/main/java/org/tasks/ui/ListFragment.kt
index b7fc98945..890c8cb5e 100644
--- a/app/src/main/java/org/tasks/ui/RemoteListFragment.kt
+++ b/app/src/main/java/org/tasks/ui/ListFragment.kt
@@ -25,7 +25,7 @@ import org.tasks.injection.FragmentComponent
 import org.tasks.preferences.DefaultFilterProvider
 import javax.inject.Inject
 
-class RemoteListFragment : TaskEditControlFragment() {
+class ListFragment : TaskEditControlFragment() {
     @BindView(R.id.dont_sync)
     lateinit var textView: TextView
 
@@ -44,7 +44,7 @@ class RemoteListFragment : TaskEditControlFragment() {
     private lateinit var callback: OnListChanged
 
     interface OnListChanged {
-        fun onListchanged(filter: Filter?)
+        fun onListChanged(filter: Filter?)
     }
 
     override fun onAttach(activity: Activity) {
@@ -97,7 +97,7 @@ class RemoteListFragment : TaskEditControlFragment() {
     private fun setSelected(filter: Filter?) {
         selectedList = filter
         refreshView()
-        callback.onListchanged(filter)
+        callback.onListChanged(filter)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {