diff --git a/app/src/main/java/org/transdroid/daemon/Daemon.java b/app/src/main/java/org/transdroid/daemon/Daemon.java
index 00b98046..92f8b854 100644
--- a/app/src/main/java/org/transdroid/daemon/Daemon.java
+++ b/app/src/main/java/org/transdroid/daemon/Daemon.java
@@ -17,22 +17,22 @@
  */
 package org.transdroid.daemon;
 
-import org.transdroid.daemon.adapters.Aria2c.Aria2Adapter;
-import org.transdroid.daemon.adapters.BitComet.BitCometAdapter;
-import org.transdroid.daemon.adapters.Bitflu.BitfluAdapter;
-import org.transdroid.daemon.adapters.BuffaloNas.BuffaloNasAdapter;
-import org.transdroid.daemon.adapters.DLinkRouterBT.DLinkRouterBTAdapter;
-import org.transdroid.daemon.adapters.Deluge.DelugeAdapter;
-import org.transdroid.daemon.adapters.Deluge.DelugeRpcAdapter;
-import org.transdroid.daemon.adapters.Ktorrent.KtorrentAdapter;
-import org.transdroid.daemon.adapters.Qbittorrent.QbittorrentAdapter;
-import org.transdroid.daemon.adapters.Rtorrent.RtorrentAdapter;
-import org.transdroid.daemon.adapters.Synology.SynologyAdapter;
-import org.transdroid.daemon.adapters.Tfb4rt.Tfb4rtAdapter;
-import org.transdroid.daemon.adapters.Transmission.TransmissionAdapter;
-import org.transdroid.daemon.adapters.Ttorrent.TtorrentAdapter;
-import org.transdroid.daemon.adapters.Utorrent.UtorrentAdapter;
-import org.transdroid.daemon.adapters.Vuze.VuzeAdapter;
+import org.transdroid.daemon.adapters.aria2c.Aria2Adapter;
+import org.transdroid.daemon.adapters.bitComet.BitCometAdapter;
+import org.transdroid.daemon.adapters.bitflu.BitfluAdapter;
+import org.transdroid.daemon.adapters.buffaloNas.BuffaloNasAdapter;
+import org.transdroid.daemon.adapters.dLinkRouterBT.DLinkRouterBTAdapter;
+import org.transdroid.daemon.adapters.deluge.DelugeAdapter;
+import org.transdroid.daemon.adapters.deluge.DelugeRpcAdapter;
+import org.transdroid.daemon.adapters.kTorrent.KTorrentAdapter;
+import org.transdroid.daemon.adapters.qBittorrent.QBittorrentAdapter;
+import org.transdroid.daemon.adapters.rTorrent.RTorrentAdapter;
+import org.transdroid.daemon.adapters.synology.SynologyAdapter;
+import org.transdroid.daemon.adapters.tfb4rt.Tfb4rtAdapter;
+import org.transdroid.daemon.adapters.transmission.TransmissionAdapter;
+import org.transdroid.daemon.adapters.tTorrent.TTorrentAdapter;
+import org.transdroid.daemon.adapters.uTorrent.UTorrentAdapter;
+import org.transdroid.daemon.adapters.vuze.VuzeAdapter;
 
 /**
  * Factory for new instances of server daemons, based on user settings.
@@ -53,7 +53,7 @@ public enum Daemon {
     },
     BitTorrent {
         public IDaemonAdapter createAdapter(DaemonSettings settings) {
-            return new UtorrentAdapter(settings);
+            return new UTorrentAdapter(settings);
         }
     },
     BuffaloNas {
@@ -88,17 +88,17 @@ public enum Daemon {
     },
     KTorrent {
         public IDaemonAdapter createAdapter(DaemonSettings settings) {
-            return new KtorrentAdapter(settings);
+            return new KTorrentAdapter(settings);
         }
     },
     qBittorrent {
         public IDaemonAdapter createAdapter(DaemonSettings settings) {
-            return new QbittorrentAdapter(settings);
+            return new QBittorrentAdapter(settings);
         }
     },
     rTorrent {
         public IDaemonAdapter createAdapter(DaemonSettings settings) {
-            return new RtorrentAdapter(settings);
+            return new RTorrentAdapter(settings);
         }
     },
     Tfb4rt {
@@ -108,7 +108,7 @@ public enum Daemon {
     },
     tTorrent {
         public IDaemonAdapter createAdapter(DaemonSettings settings) {
-            return new TtorrentAdapter(settings);
+            return new TTorrentAdapter(settings);
         }
     },
     Synology {
@@ -123,7 +123,7 @@ public enum Daemon {
     },
     uTorrent {
         public IDaemonAdapter createAdapter(DaemonSettings settings) {
-            return new UtorrentAdapter(settings);
+            return new UTorrentAdapter(settings);
         }
     },
     Vuze {
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Aria2c/Aria2Adapter.java b/app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Aria2c/Aria2Adapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java
index f2dc4baa..c45e274f 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Aria2c/Aria2Adapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Aria2c;
+package org.transdroid.daemon.adapters.aria2c;
 
 import android.net.Uri;
 import android.text.TextUtils;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/BitComet/BitCometAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/BitComet/BitCometAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java
index a8b04d97..29d9cdb6 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/BitComet/BitCometAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.BitComet;
+package org.transdroid.daemon.adapters.bitComet;
 
 import com.android.internal.http.multipart.MultipartEntity;
 import com.android.internal.http.multipart.Part;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Bitflu/BitfluAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/bitflu/BitfluAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Bitflu/BitfluAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/bitflu/BitfluAdapter.java
index 6107cebc..2b1cfdf2 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Bitflu/BitfluAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/bitflu/BitfluAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Bitflu;
+package org.transdroid.daemon.adapters.bitflu;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/BuffaloNas/BuffaloNasAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/buffaloNas/BuffaloNasAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/BuffaloNas/BuffaloNasAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/buffaloNas/BuffaloNasAdapter.java
index 3bc6ca96..04de8c48 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/BuffaloNas/BuffaloNasAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/buffaloNas/BuffaloNasAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.BuffaloNas;
+package org.transdroid.daemon.adapters.buffaloNas;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/DLinkRouterBT/DLinkRouterBTAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/dLinkRouterBT/DLinkRouterBTAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/DLinkRouterBT/DLinkRouterBTAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/dLinkRouterBT/DLinkRouterBTAdapter.java
index 195b54c5..7793362d 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/DLinkRouterBT/DLinkRouterBTAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/dLinkRouterBT/DLinkRouterBTAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.DLinkRouterBT;
+package org.transdroid.daemon.adapters.dLinkRouterBT;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeAdapter.java
similarity index 89%
rename from app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeAdapter.java
index be7849f0..22f1fe34 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Deluge;
+package org.transdroid.daemon.adapters.deluge;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -76,60 +76,60 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_ETA;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FIELDS_ARRAY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPRIORITIES;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPROGRESS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_INDEX;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_LABEL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXDOWNLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXUPLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MESSAGE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_AUTH_LOGIN;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_REMOVE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETFILE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETLABEL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NAME;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMPEERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMSEEDS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PARAMS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PARTDONE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PATH;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEDOWNLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEUPLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RESULT;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SAVEPATH;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SESSION_ID;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SIZE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIER;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIMEADDED;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TORRENTS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALPEERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSEEDS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSIZE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKER_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_UPLOADEDEVER;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_URL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DETAILS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_ETA;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILEPRIORITIES;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILEPROGRESS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_INDEX;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_LABEL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MAXDOWNLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MAXUPLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MESSAGE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_ADD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_AUTH_LOGIN;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_GET;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_PAUSE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_REMOVE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_RESUME;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETFILE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETLABEL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_NAME;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_NUMPEERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_NUMSEEDS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_PARAMS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_PARTDONE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_PATH;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RATEDOWNLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RATEUPLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RESULT;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_SAVEPATH;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_SESSION_ID;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_SIZE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TIER;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TIMEADDED;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TORRENTS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TOTALPEERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TOTALSEEDS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TOTALSIZE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TRACKERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TRACKER_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_UPLOADEDEVER;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_URL;
 
 
 /**
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeCommon.java b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeCommon.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeCommon.java
rename to app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeCommon.java
index ace884ce..179da036 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeCommon.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeCommon.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Deluge;
+package org.transdroid.daemon.adapters.deluge;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssChannel.java b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRemoteRssChannel.java
similarity index 98%
rename from app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssChannel.java
rename to app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRemoteRssChannel.java
index d2e6c0d2..a70a78f7 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssChannel.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRemoteRssChannel.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Deluge;
+package org.transdroid.daemon.adapters.deluge;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssItem.java b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRemoteRssItem.java
similarity index 96%
rename from app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssItem.java
rename to app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRemoteRssItem.java
index 67718436..4e3e1337 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRemoteRssItem.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRemoteRssItem.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Deluge;
+package org.transdroid.daemon.adapters.deluge;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRpcAdapter.java
similarity index 87%
rename from app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRpcAdapter.java
index 45e245c5..9e862756 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRpcAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Deluge;
+package org.transdroid.daemon.adapters.deluge;
 
 import androidx.annotation.NonNull;
 
@@ -80,66 +80,66 @@ import java.util.Set;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_DOWNLOAD_LOCATION;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_ETA;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FIELDS_ARRAY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPRIORITIES;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILEPROGRESS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_HASH;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_INDEX;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_KEY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_LABEL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXDOWNLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MAXUPLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MESSAGE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD_FILE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_LABELS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_METHOD_LIST;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_RSS_CONFIG;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_GET_TORRENTS_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_INFO;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_REMOVE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETLABEL;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_SET_TORRENT_OPTIONS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MOVE_COMPLETED;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_MOVE_COMPLETED_PATH;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NAME;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMPEERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_NUMSEEDS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PARTDONE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_PATH;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEDOWNLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RATEUPLOAD;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RSSFEEDS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_RSSFEED_KEY;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SAVEPATH;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SIZE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_SUBSCRIPTIONS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIER;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TIMEADDED;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALPEERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSEEDS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TOTALSIZE;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKERS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_TRACKER_STATUS;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_UPLOADEDEVER;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_URL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DETAILS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DETAILS_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DOWNLOADEDEVER;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_DOWNLOAD_LOCATION;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_ETA;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILEPRIORITIES;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILEPROGRESS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_FILE_FIELDS_ARRAY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_HASH;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_INDEX;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_KEY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_LABEL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MAXDOWNLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MAXUPLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MESSAGE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_ADD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_ADD_FILE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_ADD_MAGNET;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_FORCERECHECK;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_GET_LABELS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_GET_METHOD_LIST;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_GET_RSS_CONFIG;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_GET_TORRENTS_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_INFO;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_MOVESTORAGE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_PAUSE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_PAUSE_ALL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_REMOVE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_RESUME;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_RESUME_ALL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETCONFIG;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETLABEL;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SETTRACKERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_SET_TORRENT_OPTIONS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MOVE_COMPLETED;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_MOVE_COMPLETED_PATH;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_NAME;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_NUMPEERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_NUMSEEDS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_PARTDONE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_PATH;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RATEDOWNLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RATEUPLOAD;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RSSFEEDS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_RSSFEED_KEY;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_SAVEPATH;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_SIZE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_SUBSCRIPTIONS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TIER;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TIMEADDED;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TOTALPEERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TOTALSEEDS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TOTALSIZE;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TRACKERS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_TRACKER_STATUS;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_UPLOADEDEVER;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_URL;
 
 /**
  * The daemon adapter from the Deluge torrent client using deluged API directly.
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcClient.java b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRpcClient.java
similarity index 97%
rename from app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcClient.java
rename to app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRpcClient.java
index f23ec9b1..ffc4c6fe 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Deluge/DelugeRpcClient.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/deluge/DelugeRpcClient.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Deluge;
+package org.transdroid.daemon.adapters.deluge;
 
 import androidx.annotation.NonNull;
 
@@ -39,8 +39,8 @@ import java.util.zip.InflaterInputStream;
 
 import se.dimovski.rencode.Rencode;
 
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_DAEMON_LOGIN;
-import static org.transdroid.daemon.adapters.Deluge.DelugeCommon.RPC_METHOD_INFO;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_DAEMON_LOGIN;
+import static org.transdroid.daemon.adapters.deluge.DelugeCommon.RPC_METHOD_INFO;
 
 /**
  * A Deluge RPC API Client.
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/FileListParser.java b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/FileListParser.java
similarity index 98%
rename from app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/FileListParser.java
rename to app/src/main/java/org/transdroid/daemon/adapters/kTorrent/FileListParser.java
index 9f7fa3ae..12531973 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/FileListParser.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/FileListParser.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Ktorrent;
+package org.transdroid.daemon.adapters.kTorrent;
 
 import org.transdroid.daemon.DaemonException;
 import org.transdroid.daemon.DaemonException.ExceptionType;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/KtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/KTorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/KtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/kTorrent/KTorrentAdapter.java
index 6dd60177..788f4691 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/KtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/KTorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Ktorrent;
+package org.transdroid.daemon.adapters.kTorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -71,7 +71,7 @@ import java.util.List;
  *
  * @author erickok
  */
-public class KtorrentAdapter implements IDaemonAdapter {
+public class KTorrentAdapter implements IDaemonAdapter {
 
     private static final String LOG_NAME = "Ktorrent daemon";
 
@@ -93,7 +93,7 @@ public class KtorrentAdapter implements IDaemonAdapter {
     /**
      * Initialises an adapter that provides operations to the Ktorrent web interface
      */
-    public KtorrentAdapter(DaemonSettings settings) {
+    public KTorrentAdapter(DaemonSettings settings) {
         this.settings = settings;
     }
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/LoggedOutException.java b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/LoggedOutException.java
similarity index 69%
rename from app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/LoggedOutException.java
rename to app/src/main/java/org/transdroid/daemon/adapters/kTorrent/LoggedOutException.java
index e3f28624..f168a7f5 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/LoggedOutException.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/LoggedOutException.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Ktorrent;
+package org.transdroid.daemon.adapters.kTorrent;
 
 public class LoggedOutException extends Exception {
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/StatsParser.java b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/StatsParser.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/StatsParser.java
rename to app/src/main/java/org/transdroid/daemon/adapters/kTorrent/StatsParser.java
index 4513725c..a4c34916 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Ktorrent/StatsParser.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/kTorrent/StatsParser.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Ktorrent;
+package org.transdroid.daemon.adapters.kTorrent;
 
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.DaemonException;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Qbittorrent/QbittorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/qBittorrent/QBittorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Qbittorrent/QbittorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/qBittorrent/QBittorrentAdapter.java
index a46cc56f..eda15980 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Qbittorrent/QbittorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/qBittorrent/QBittorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Qbittorrent;
+package org.transdroid.daemon.adapters.qBittorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -83,7 +83,7 @@ import java.util.Map;
  *
  * @author erickok
  */
-public class QbittorrentAdapter implements IDaemonAdapter {
+public class QBittorrentAdapter implements IDaemonAdapter {
 
     private static final String LOG_NAME = "qBittorrent daemon";
 
@@ -91,7 +91,7 @@ public class QbittorrentAdapter implements IDaemonAdapter {
     private DefaultHttpClient httpclient;
     private int version = -1;
 
-    public QbittorrentAdapter(DaemonSettings settings) {
+    public QBittorrentAdapter(DaemonSettings settings) {
         this.settings = settings;
     }
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Rtorrent/RtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/rTorrent/RTorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Rtorrent/RtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/rTorrent/RTorrentAdapter.java
index 30c996e9..62a8c914 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Rtorrent/RtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/rTorrent/RTorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Rtorrent;
+package org.transdroid.daemon.adapters.rTorrent;
 
 import android.text.TextUtils;
 
@@ -76,7 +76,7 @@ import de.timroes.axmlrpc.XMLRPCException;
  *
  * @author erickok
  */
-public class RtorrentAdapter implements IDaemonAdapter {
+public class RTorrentAdapter implements IDaemonAdapter {
 
     private static final String LOG_NAME = "rTorrent daemon";
 
@@ -89,7 +89,7 @@ public class RtorrentAdapter implements IDaemonAdapter {
     private List<Label> lastKnownLabels = null;
     private Integer version = null;
 
-    public RtorrentAdapter(DaemonSettings settings) {
+    public RTorrentAdapter(DaemonSettings settings) {
         this.settings = settings;
     }
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Synology/SynologyAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/synology/SynologyAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Synology/SynologyAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/synology/SynologyAdapter.java
index 125039c0..c23da538 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Synology/SynologyAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/synology/SynologyAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Synology;
+package org.transdroid.daemon.adapters.synology;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Ttorrent/TtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/tTorrent/TTorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Ttorrent/TtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/tTorrent/TTorrentAdapter.java
index fd97bc31..c8728cff 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Ttorrent/TtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/tTorrent/TTorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Ttorrent;
+package org.transdroid.daemon.adapters.tTorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -73,14 +73,14 @@ import java.util.List;
  *
  * @author erickok
  */
-public class TtorrentAdapter implements IDaemonAdapter {
+public class TTorrentAdapter implements IDaemonAdapter {
 
     private static final String LOG_NAME = "tTorrent daemon";
 
     private DaemonSettings settings;
     private DefaultHttpClient httpclient;
 
-    public TtorrentAdapter(DaemonSettings settings) {
+    public TTorrentAdapter(DaemonSettings settings) {
         this.settings = settings;
     }
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/StatsParser.java b/app/src/main/java/org/transdroid/daemon/adapters/tfb4rt/StatsParser.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/StatsParser.java
rename to app/src/main/java/org/transdroid/daemon/adapters/tfb4rt/StatsParser.java
index 73295d07..9ff6ab24 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/StatsParser.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/tfb4rt/StatsParser.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Tfb4rt;
+package org.transdroid.daemon.adapters.tfb4rt;
 
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.DaemonException;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/Tfb4rtAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/tfb4rt/Tfb4rtAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/Tfb4rtAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/tfb4rt/Tfb4rtAdapter.java
index 6d06734c..02c9ed79 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Tfb4rt/Tfb4rtAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/tfb4rt/Tfb4rtAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Tfb4rt;
+package org.transdroid.daemon.adapters.tfb4rt;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Transmission/TransmissionAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/transmission/TransmissionAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Transmission/TransmissionAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/transmission/TransmissionAdapter.java
index bc887921..a21e0940 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Transmission/TransmissionAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/transmission/TransmissionAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Transmission;
+package org.transdroid.daemon.adapters.transmission;
 
 import net.iharder.Base64;
 import net.iharder.Base64.InputStream;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/UtorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/uTorrent/UTorrentAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Utorrent/UtorrentAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/uTorrent/UTorrentAdapter.java
index c109522d..1d46fcba 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/UtorrentAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/uTorrent/UTorrentAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Utorrent;
+package org.transdroid.daemon.adapters.uTorrent;
 
 import com.android.internal.http.multipart.FilePart;
 import com.android.internal.http.multipart.MultipartEntity;
@@ -43,7 +43,7 @@ import org.transdroid.daemon.Torrent;
 import org.transdroid.daemon.TorrentDetails;
 import org.transdroid.daemon.TorrentFile;
 import org.transdroid.daemon.TorrentStatus;
-import org.transdroid.daemon.adapters.Utorrent.data.UTorrentRemoteRssChannel;
+import org.transdroid.daemon.adapters.uTorrent.data.UTorrentRemoteRssChannel;
 import org.transdroid.daemon.task.AddByFileTask;
 import org.transdroid.daemon.task.AddByMagnetUrlTask;
 import org.transdroid.daemon.task.AddByUrlTask;
@@ -84,7 +84,7 @@ import java.util.List;
  *
  * @author erickok
  */
-public class UtorrentAdapter implements IDaemonAdapter, RemoteRssSupplier {
+public class UTorrentAdapter implements IDaemonAdapter, RemoteRssSupplier {
 
     private static final String LOG_NAME = "uTorrent daemon";
     private static final String RPC_URL_HASH = "&hash=";
@@ -125,7 +125,7 @@ public class UtorrentAdapter implements IDaemonAdapter, RemoteRssSupplier {
     /**
      * Initialises an adapter that provides operations to the uTorrent web daemon
      */
-    public UtorrentAdapter(DaemonSettings settings) {
+    public UTorrentAdapter(DaemonSettings settings) {
         this.settings = settings;
     }
 
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssChannel.java b/app/src/main/java/org/transdroid/daemon/adapters/uTorrent/data/UTorrentRemoteRssChannel.java
similarity index 97%
rename from app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssChannel.java
rename to app/src/main/java/org/transdroid/daemon/adapters/uTorrent/data/UTorrentRemoteRssChannel.java
index f50459c0..4f2793bf 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssChannel.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/uTorrent/data/UTorrentRemoteRssChannel.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Utorrent.data;
+package org.transdroid.daemon.adapters.uTorrent.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssItem.java b/app/src/main/java/org/transdroid/daemon/adapters/uTorrent/data/UTorrentRemoteRssItem.java
similarity index 97%
rename from app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssItem.java
rename to app/src/main/java/org/transdroid/daemon/adapters/uTorrent/data/UTorrentRemoteRssItem.java
index 63a6c809..8b48e3e7 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Utorrent/data/UTorrentRemoteRssItem.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/uTorrent/data/UTorrentRemoteRssItem.java
@@ -1,4 +1,4 @@
-package org.transdroid.daemon.adapters.Utorrent.data;
+package org.transdroid.daemon.adapters.uTorrent.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/vuze/VuzeAdapter.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeAdapter.java
rename to app/src/main/java/org/transdroid/daemon/adapters/vuze/VuzeAdapter.java
index 408b1e04..488c79d6 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/vuze/VuzeAdapter.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Vuze;
+package org.transdroid.daemon.adapters.vuze;
 
 import org.apache.openjpa.lib.util.Base16Encoder;
 import org.transdroid.core.gui.log.Log;
diff --git a/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeXmlOverHttpClient.java b/app/src/main/java/org/transdroid/daemon/adapters/vuze/VuzeXmlOverHttpClient.java
similarity index 99%
rename from app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeXmlOverHttpClient.java
rename to app/src/main/java/org/transdroid/daemon/adapters/vuze/VuzeXmlOverHttpClient.java
index 873d1ccc..481311bc 100644
--- a/app/src/main/java/org/transdroid/daemon/adapters/Vuze/VuzeXmlOverHttpClient.java
+++ b/app/src/main/java/org/transdroid/daemon/adapters/vuze/VuzeXmlOverHttpClient.java
@@ -15,7 +15,7 @@
  *	along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.transdroid.daemon.adapters.Vuze;
+package org.transdroid.daemon.adapters.vuze;
 
 import android.util.Xml;