diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index 4c033c57..d633b564 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -46,7 +46,7 @@ import android.widget.TextView;
 
 import org.json.JSONException;
 import org.lineageos.updater.controller.UpdaterController;
-import org.lineageos.updater.controller.UpdaterControllerInt;
+import org.lineageos.updater.controller.Controller;
 import org.lineageos.updater.controller.UpdaterService;
 import org.lineageos.updater.download.DownloadClient;
 import org.lineageos.updater.misc.BuildInfoUtils;
@@ -233,7 +233,7 @@ public class UpdatesActivity extends AppCompatActivity {
     private void loadUpdatesList(File jsonFile, boolean manualRefresh)
             throws IOException, JSONException {
         Log.d(TAG, "Adding remote updates");
-        UpdaterControllerInt controller = mUpdaterService.getUpdaterController();
+        Controller controller = mUpdaterService.getUpdaterController();
         boolean newUpdates = false;
 
         List<UpdateDownload> updates = Utils.parseJson(jsonFile, true);
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 9a98784c..1fe16227 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -30,7 +30,7 @@ import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import org.lineageos.updater.controller.UpdaterControllerInt;
+import org.lineageos.updater.controller.Controller;
 import org.lineageos.updater.misc.BuildInfoUtils;
 import org.lineageos.updater.misc.StringGenerator;
 import org.lineageos.updater.misc.Utils;
@@ -49,7 +49,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
     private final float mAlphaDisabledValue;
 
     private List<String> mDownloadIds;
-    private UpdaterControllerInt mUpdaterController;
+    private Controller mUpdaterController;
     private Context mContext;
     private View mContainerView;
 
@@ -105,7 +105,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         return new ViewHolder(view);
     }
 
-    public void setUpdaterController(UpdaterControllerInt updaterController) {
+    public void setUpdaterController(Controller updaterController) {
         mUpdaterController = updaterController;
         notifyDataSetChanged();
     }
diff --git a/src/org/lineageos/updater/controller/UpdaterControllerInt.java b/src/org/lineageos/updater/controller/Controller.java
similarity index 97%
rename from src/org/lineageos/updater/controller/UpdaterControllerInt.java
rename to src/org/lineageos/updater/controller/Controller.java
index 2ef98eef..7005a708 100644
--- a/src/org/lineageos/updater/controller/UpdaterControllerInt.java
+++ b/src/org/lineageos/updater/controller/Controller.java
@@ -20,7 +20,7 @@ import org.lineageos.updater.model.UpdateDownload;
 import java.util.List;
 import java.util.Set;
 
-public interface UpdaterControllerInt {
+public interface Controller {
 
     boolean addUpdate(UpdateDownload update);
 
diff --git a/src/org/lineageos/updater/controller/UpdaterController.java b/src/org/lineageos/updater/controller/UpdaterController.java
index 73240579..7b1c1787 100644
--- a/src/org/lineageos/updater/controller/UpdaterController.java
+++ b/src/org/lineageos/updater/controller/UpdaterController.java
@@ -37,7 +37,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class UpdaterController implements UpdaterControllerInt {
+public class UpdaterController implements Controller {
 
     public static final String ACTION_DOWNLOAD_PROGRESS = "action_download_progress";
     public static final String ACTION_INSTALL_PROGRESS = "action_install_progress";
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index 386e025b..ce3c4bfc 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -180,7 +180,7 @@ public class UpdaterService extends Service {
         return START_NOT_STICKY;
     }
 
-    public UpdaterControllerInt getUpdaterController() {
+    public Controller getUpdaterController() {
         return mUpdaterController;
     }