diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyElementContract.java
similarity index 93%
rename from app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyContract.java
rename to app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyElementContract.java
index 582302b23..ea64fb60c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyElementContract.java
@@ -5,7 +5,7 @@ package fr.free.nrw.commons.nearby.mvp.contract;
  * this interface. This interface can be considered parent
  * of both NearbyMapContract and NearbyListContract
  */
-public interface NearbyContract {
+public interface NearbyElementContract {
 
     interface View {
         void showPlaces();
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyListContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyListContract.java
index 4073b89c2..a2bb150d9 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyListContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyListContract.java
@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.nearby.mvp.contract;
 
-import fr.free.nrw.commons.nearby.mvp.contract.NearbyContract;
-
 /**
  * This interface defines specific View and UserActions for list
  * part of the nearby. On the other hand both extends methods
@@ -10,11 +8,11 @@ import fr.free.nrw.commons.nearby.mvp.contract.NearbyContract;
  */
 public interface NearbyListContract {
 
-    interface View extends NearbyContract.View {
+    interface View extends NearbyElementContract.View {
         // Even if this is empty for now, I keep this one for code consistency
     }
 
-    interface UserActions extends NearbyContract.UserActions {
+    interface UserActions extends NearbyElementContract.UserActions {
         void expandItem();
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java
index 122efe9c8..d5ef811be 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/contract/NearbyMapContract.java
@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.nearby.mvp.contract;
 
-import fr.free.nrw.commons.nearby.mvp.contract.NearbyContract;
-
 /**
  * This interface defines specific View and UserActions for map
  * part of the nearby. On the other hand both extends methods
@@ -10,13 +8,13 @@ import fr.free.nrw.commons.nearby.mvp.contract.NearbyContract;
  */
 public interface NearbyMapContract {
 
-    interface View extends NearbyContract.View{
+    interface View extends NearbyElementContract.View{
         void showSearchThisAreaButton();
         void showInformationBottomSheet();
         void showFABs();
     }
 
-    interface UserActions extends NearbyContract.UserActions {
+    interface UserActions extends NearbyElementContract.UserActions {
         void searchThisArea();
         void recenterMap();
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java
index bb28417b8..9decfce88 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java
@@ -3,6 +3,7 @@ package fr.free.nrw.commons.nearby.mvp.presenter;
 import fr.free.nrw.commons.nearby.mvp.contract.NearbyListContract;
 
 public class NearbyListPresenter implements NearbyListContract.UserActions {
+
     @Override
     public void expandItem() {