diff --git a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenter.java b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenter.java
index e1a8022..4e76704 100644
--- a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenter.java
+++ b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenter.java
@@ -10,32 +10,32 @@
 import java.util.concurrent.TimeUnit;
 
 public class IssTrackingPresenter implements IssTrackingPresenterInterface {
-  private final IssTrackingInteractorInterface issTrackingInteractorInterface;
-  private IssTrackingViewInterface view;
-  private final IssTrackingViewInterface nullView = new IssTrackingViewInterface.NullView();
+  private final IssTrackingRepositoryInterface issTrackingRepositoryInterface;
+  private IssTrackingView view;
+  private final IssTrackingView nullView = new IssTrackingView.NullView();
   private Disposable timerSubscription;
-  private CompositeDisposable compositeDisposable = new CompositeDisposable();
+  private final CompositeDisposable compositeDisposable = new CompositeDisposable();
   private final Scheduler scheduler;
   private final Observable<Long> timer = Observable.timer(60, TimeUnit.SECONDS, AndroidSchedulers.mainThread());
 
-  public IssTrackingPresenter(IssTrackingInteractorInterface issTrackingInteractorInterface) {
-    this(issTrackingInteractorInterface, AndroidSchedulers.mainThread());
+  public IssTrackingPresenter(IssTrackingRepositoryInterface issTrackingRepositoryInterface) {
+    this(issTrackingRepositoryInterface, AndroidSchedulers.mainThread());
   }
 
-  private IssTrackingPresenter(IssTrackingInteractorInterface issTrackingInteractorInterface, Scheduler scheduler) {
-    this.issTrackingInteractorInterface = issTrackingInteractorInterface;
+  private IssTrackingPresenter(IssTrackingRepositoryInterface issTrackingRepositoryInterface, Scheduler scheduler) {
+    this.issTrackingRepositoryInterface = issTrackingRepositoryInterface;
     this.view = nullView;
     this.scheduler = scheduler;
   }
 
   @Override
-  public void setView(IssTrackingViewInterface view) {
+  public void setView(IssTrackingView view) {
     this.view = view;
   }
 
   @Override
   public void retrieveCurrentPosition() {
-    Disposable currentPositionSubscription = issTrackingInteractorInterface.getCurrentPosition()
+    Disposable currentPositionSubscription = issTrackingRepositoryInterface.getCurrentPosition()
         .subscribeOn(Schedulers.io())
         .observeOn(scheduler)
         .subscribe(currentPositionResponse -> view.setIssPosition(currentPositionResponse.position),
@@ -52,7 +52,7 @@ public void retrieveCurrentPosition() {
   @Override
   public void retrievePassTimes(double latitude, double longitude) {
     view.willRetrievePassTimes();
-    Disposable passTimesSubscription = issTrackingInteractorInterface.getPassTimes(latitude, longitude)
+    Disposable passTimesSubscription = issTrackingRepositoryInterface.getPassTimes(latitude, longitude)
         .subscribeOn(Schedulers.io())
         .observeOn(scheduler)
         .subscribe(passTimesResponse -> view.showPassTimes(passTimesResponse.passTimes),
@@ -63,7 +63,7 @@ public void retrievePassTimes(double latitude, double longitude) {
   @Override
   public void retrievePeopleInSpace() {
     view.willRetrievePeopleInSpace();
-    Disposable peopleInSpaceSubscription = issTrackingInteractorInterface.getPeopleInSpace()
+    Disposable peopleInSpaceSubscription = issTrackingRepositoryInterface.getPeopleInSpace()
         .subscribeOn(Schedulers.io())
         .observeOn(scheduler)
         .subscribe(peopleInSpaceResponse -> view.showPeopleInSpace(peopleInSpaceResponse.people),
diff --git a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenterInterface.java b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenterInterface.java
index d8b2a7a..75b8509 100644
--- a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenterInterface.java
+++ b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingPresenterInterface.java
@@ -7,7 +7,7 @@ public interface IssTrackingPresenterInterface {
 
   void retrievePeopleInSpace();
 
-  void setView(IssTrackingViewInterface view);
+  void setView(IssTrackingView view);
 
   void stop();
 }
diff --git a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingInteractor.java b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingRepository.java
similarity index 81%
rename from app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingInteractor.java
rename to app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingRepository.java
index 102f622..2cc74e9 100644
--- a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingInteractor.java
+++ b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingRepository.java
@@ -2,10 +2,10 @@
 
 import io.reactivex.Observable;
 
-public class IssTrackingInteractor implements IssTrackingInteractorInterface {
+public class IssTrackingRepository implements IssTrackingRepositoryInterface {
   private final IssTrackingApiInterface api;
 
-  public IssTrackingInteractor(IssTrackingApiInterface api) {
+  public IssTrackingRepository(IssTrackingApiInterface api) {
     this.api = api;
   }
 
diff --git a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingInteractorInterface.java b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingRepositoryInterface.java
similarity index 87%
rename from app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingInteractorInterface.java
rename to app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingRepositoryInterface.java
index c5bdeaa..8dd02e6 100644
--- a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingInteractorInterface.java
+++ b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingRepositoryInterface.java
@@ -2,7 +2,7 @@
 
 import io.reactivex.Observable;
 
-public interface IssTrackingInteractorInterface {
+public interface IssTrackingRepositoryInterface {
   Observable<IssTrackingApiInterface.CurrentPositionResponse> getCurrentPosition();
 
   Observable<IssTrackingApiInterface.PassTimesResponse> getPassTimes(double latitude,
diff --git a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingViewInterface.java b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingView.java
similarity index 92%
rename from app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingViewInterface.java
rename to app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingView.java
index 6b29e9a..f2d5a98 100644
--- a/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingViewInterface.java
+++ b/app/src/main/java/com/ferranpons/spacehub/issTracking/IssTrackingView.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-public interface IssTrackingViewInterface {
+public interface IssTrackingView {
 
   void showCurrentPositionError();
 
@@ -24,7 +24,7 @@ public interface IssTrackingViewInterface {
 
   void showPeopleInSpace(List<IssTrackingApiInterface.Person> people);
 
-  class NullView implements IssTrackingViewInterface {
+  class NullView implements IssTrackingView {
 
     @Override
     public void showCurrentPositionError() {
diff --git a/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt b/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt
index 5d05037..836d1ca 100644
--- a/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt
+++ b/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt
@@ -10,23 +10,26 @@ import com.ferranpons.spacehub.R
 import com.ferranpons.spacehub.issTracking.IssTrackingApi
 import com.ferranpons.spacehub.issTracking.IssTrackingApiInterface
 import com.ferranpons.spacehub.issTracking.IssTrackingPresenterInterface
-import com.ferranpons.spacehub.issTracking.IssTrackingViewInterface
+import com.ferranpons.spacehub.issTracking.IssTrackingView
 import com.ferranpons.spacehub.issTracking.IssTrackingPresenter
-import com.ferranpons.spacehub.issTracking.IssTrackingInteractor
+import com.ferranpons.spacehub.issTracking.IssTrackingRepository
 
-class ScheduleFragment : Fragment(), IssTrackingViewInterface {
+class ScheduleFragment : Fragment(), IssTrackingView {
     private lateinit var issTrackingPresenter: IssTrackingPresenterInterface
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
 
-        issTrackingPresenter = IssTrackingPresenter(IssTrackingInteractor(IssTrackingApi.getIssTrackingApi("http://api.open-notify.org")))
+        issTrackingPresenter = IssTrackingPresenter(
+            IssTrackingRepository(
+                IssTrackingApi.getIssTrackingApi("http://api.open-notify.org")
+            )
+        )
         (issTrackingPresenter as IssTrackingPresenter).setView(this)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.fragment_schedule, container, false)
-        return view
+        return inflater.inflate(R.layout.fragment_schedule, container, false)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {