diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 31fa742be..f2aca943d 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -92,7 +92,7 @@ import org.tasks.data.TagDataDao;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.dialogs.SortDialog;
 import org.tasks.etesync.EteSyncCalendarSettingsActivity;
-import org.tasks.filters.LocationFilter;
+import org.tasks.filters.PlaceFilter;
 import org.tasks.injection.ForActivity;
 import org.tasks.injection.FragmentComponent;
 import org.tasks.injection.InjectingFragment;
@@ -445,7 +445,7 @@ public final class TaskListFragment extends InjectingFragment
         startActivityForResult(caldavSettings, REQUEST_LIST_SETTINGS);
         return true;
       case R.id.menu_location_settings:
-        Place place = ((LocationFilter) filter).getPlace();
+        Place place = ((PlaceFilter) filter).getPlace();
         Intent intent =
             new Intent(
                 getActivity(),
@@ -473,7 +473,7 @@ public final class TaskListFragment extends InjectingFragment
         localBroadcastManager.broadcastRefresh();
         return true;
       case R.id.menu_open_map:
-        ((LocationFilter) filter).openMap(context);
+        ((PlaceFilter) filter).openMap(context);
         return true;
       default:
         return onOptionsItemSelected(item);
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
index 2c1973db0..95ad2853f 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.java
@@ -25,7 +25,7 @@ import com.todoroo.astrid.api.GtasksFilter;
 import com.todoroo.astrid.api.TagFilter;
 import org.tasks.R;
 import org.tasks.billing.Inventory;
-import org.tasks.filters.LocationFilter;
+import org.tasks.filters.PlaceFilter;
 import org.tasks.locale.Locale;
 import org.tasks.preferences.SyncPreferences;
 import org.tasks.themes.ColorProvider;
@@ -159,7 +159,7 @@ public class FilterViewHolder extends RecyclerView.ViewHolder {
       return R.drawable.ic_outline_cloud_24px;
     } else if (filter instanceof CustomFilter) {
       return R.drawable.ic_outline_filter_list_24px;
-    } else if (filter instanceof LocationFilter) {
+    } else if (filter instanceof PlaceFilter) {
       return R.drawable.ic_outline_place_24px;
     } else {
       return filter.icon;
diff --git a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
index cb68268ee..b949e3faf 100644
--- a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
@@ -13,7 +13,7 @@ import com.todoroo.astrid.activity.TaskListFragment
 import org.tasks.R
 import org.tasks.data.LocationDao
 import org.tasks.data.Place
-import org.tasks.filters.LocationFilter
+import org.tasks.filters.PlaceFilter
 import org.tasks.injection.ActivityComponent
 import org.tasks.location.MapFragment
 import javax.inject.Inject
@@ -78,7 +78,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
         setResult(
                 Activity.RESULT_OK,
                 Intent(TaskListFragment.ACTION_RELOAD)
-                        .putExtra(MainActivity.OPEN_FILTER, LocationFilter(place)))
+                        .putExtra(MainActivity.OPEN_FILTER, PlaceFilter(place)))
         finish()
     }
 
diff --git a/app/src/main/java/org/tasks/filters/LocationFilters.java b/app/src/main/java/org/tasks/filters/LocationFilters.java
index 9124ed525..08cd286ae 100644
--- a/app/src/main/java/org/tasks/filters/LocationFilters.java
+++ b/app/src/main/java/org/tasks/filters/LocationFilters.java
@@ -7,8 +7,8 @@ public class LocationFilters {
   @Embedded public Place place;
   public int count;
 
-  public LocationFilter toLocationFilter() {
-    LocationFilter filter = new LocationFilter(place);
+  public PlaceFilter toLocationFilter() {
+    PlaceFilter filter = new PlaceFilter(place);
     filter.count = count;
     return filter;
   }
diff --git a/app/src/main/java/org/tasks/filters/LocationFilter.java b/app/src/main/java/org/tasks/filters/PlaceFilter.java
similarity index 77%
rename from app/src/main/java/org/tasks/filters/LocationFilter.java
rename to app/src/main/java/org/tasks/filters/PlaceFilter.java
index 3b6a675b0..ba04a928d 100644
--- a/app/src/main/java/org/tasks/filters/LocationFilter.java
+++ b/app/src/main/java/org/tasks/filters/PlaceFilter.java
@@ -17,26 +17,26 @@ import org.tasks.R;
 import org.tasks.data.Geofence;
 import org.tasks.data.Place;
 
-public class LocationFilter extends Filter {
+public class PlaceFilter extends Filter {
 
-  public static final Parcelable.Creator<LocationFilter> CREATOR =
-      new Parcelable.Creator<LocationFilter>() {
+  public static final Parcelable.Creator<PlaceFilter> CREATOR =
+      new Parcelable.Creator<PlaceFilter>() {
 
         @Override
-        public LocationFilter createFromParcel(Parcel source) {
-          return new LocationFilter(source);
+        public PlaceFilter createFromParcel(Parcel source) {
+          return new PlaceFilter(source);
         }
 
         /** {@inheritDoc} */
         @Override
-        public LocationFilter[] newArray(int size) {
-          return new LocationFilter[size];
+        public PlaceFilter[] newArray(int size) {
+          return new PlaceFilter[size];
         }
       };
 
   private Place place;
 
-  private LocationFilter(Parcel source) {
+  private PlaceFilter(Parcel source) {
     super();
     readFromParcel(source);
     place = source.readParcelable(getClass().getClassLoader());
@@ -48,7 +48,7 @@ public class LocationFilter extends Filter {
     dest.writeParcelable(place, 0);
   }
 
-  public LocationFilter(Place place) {
+  public PlaceFilter(Place place) {
     super(place.getDisplayName(), queryTemplate(place), getValuesForNewTask(place));
     this.place = place;
     tint = place.getColor();
@@ -92,13 +92,13 @@ public class LocationFilter extends Filter {
 
   @Override
   public boolean areItemsTheSame(@NonNull FilterListItem other) {
-    return other instanceof LocationFilter
-        && place.getUid().equals(((LocationFilter) other).getPlace().getUid());
+    return other instanceof PlaceFilter
+        && place.getUid().equals(((PlaceFilter) other).getPlace().getUid());
   }
 
   @Override
   public boolean areContentsTheSame(@NonNull FilterListItem other) {
-    return place.equals(((LocationFilter) other).getPlace()) && count == other.count;
+    return place.equals(((PlaceFilter) other).getPlace()) && count == other.count;
   }
 
   public void openMap(Context context) {
diff --git a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java
index 61cf5f2df..bdac3c4d3 100644
--- a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java
+++ b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.java
@@ -28,7 +28,7 @@ import org.tasks.data.GoogleTaskList;
 import org.tasks.data.GoogleTaskListDao;
 import org.tasks.data.LocationDao;
 import org.tasks.data.Place;
-import org.tasks.filters.LocationFilter;
+import org.tasks.filters.PlaceFilter;
 import org.tasks.injection.ForApplication;
 import timber.log.Timber;
 
@@ -145,7 +145,7 @@ public class DefaultFilterProvider {
         return caldavCalendar == null ? null : new CaldavFilter(caldavCalendar);
       case TYPE_LOCATION:
         Place place = locationDao.getPlace(split[1]);
-        return place == null ? null : new LocationFilter(place);
+        return place == null ? null : new PlaceFilter(place);
       default:
         return null;
     }
@@ -172,7 +172,7 @@ public class DefaultFilterProvider {
       case TYPE_CALDAV:
         return getFilterPreference(filterType, ((CaldavFilter) filter).getUuid());
       case TYPE_LOCATION:
-        return getFilterPreference(filterType, ((LocationFilter) filter).getUid());
+        return getFilterPreference(filterType, ((PlaceFilter) filter).getUid());
     }
     return null;
   }
@@ -190,7 +190,7 @@ public class DefaultFilterProvider {
       return TYPE_CUSTOM_FILTER;
     } else if (filter instanceof CaldavFilter) {
       return TYPE_CALDAV;
-    } else if (filter instanceof LocationFilter) {
+    } else if (filter instanceof PlaceFilter) {
       return TYPE_LOCATION;
     }
     return TYPE_FILTER;
diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java
index 7dcd10658..7fed21f79 100644
--- a/app/src/main/java/org/tasks/ui/ChipProvider.java
+++ b/app/src/main/java/org/tasks/ui/ChipProvider.java
@@ -29,7 +29,7 @@ import org.tasks.billing.Inventory;
 import org.tasks.data.Location;
 import org.tasks.data.TagData;
 import org.tasks.data.TaskContainer;
-import org.tasks.filters.LocationFilter;
+import org.tasks.filters.PlaceFilter;
 import org.tasks.locale.Locale;
 import org.tasks.preferences.Preferences;
 import org.tasks.themes.ColorProvider;
@@ -113,9 +113,9 @@ public class ChipProvider {
     if (!hideSubtaskChip && task.hasChildren()) {
       chips.add(newSubtaskChip(task, !showText));
     }
-    if (task.hasLocation() && !(filter instanceof LocationFilter)) {
+    if (task.hasLocation() && !(filter instanceof PlaceFilter)) {
       Location location = task.getLocation();
-      chips.add(newChip(new LocationFilter(location.getPlace()), R.drawable.ic_outline_place_24px));
+      chips.add(newChip(new PlaceFilter(location.getPlace()), R.drawable.ic_outline_place_24px));
     }
     if (!isSubtask) {
       if (!Strings.isNullOrEmpty(task.getGoogleTaskList()) && !(filter instanceof GtasksFilter)) {