diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 9e0d84c84..a1d1afc3b 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -61,7 +61,7 @@
                     android:value=".views.main.MainActivity"/>
         </activity>
 
-        <receiver android:name=".receiver.WifiStateChangeReceiver">
+        <receiver android:name=".nearby.WifiStateChangeReceiver">
             <intent-filter>
                 <action android:name="android.net.wifi.STATE_CHANGE"/>
             </intent-filter>
diff --git a/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
similarity index 87%
rename from app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
index f23d4b774..fd1bae629 100644
--- a/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
@@ -1,11 +1,10 @@
-package org.fdroid.fdroid.receiver;
+package org.fdroid.fdroid.nearby;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.nearby.WifiStateChangeService;
 
 public class WifiStateChangeReceiver extends BroadcastReceiver {
     private static final String TAG = "WifiStateChangeReceiver";
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
index 6a299758b..4d2636b99 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
@@ -37,7 +37,7 @@ import java.util.Locale;
  * Handle state changes to the device's wifi, storing the required bits.
  * The {@link Intent} that starts it either has no extras included,
  * which is how it can be triggered by code, or it came in from the system
- * via {@link  org.fdroid.fdroid.receiver.WifiStateChangeReceiver}, in
+ * via {@link WifiStateChangeReceiver}, in
  * which case an instance of {@link NetworkInfo} is included.
  * <p>
  * The work is done in a {@link Thread} so that new incoming {@code Intents}
@@ -278,7 +278,7 @@ public class WifiStateChangeService extends IntentService {
             while (networkInterfaces.hasMoreElements()) {
                 NetworkInterface netIf = networkInterfaces.nextElement();
 
-                for (Enumeration<InetAddress> inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements();) {
+                for (Enumeration<InetAddress> inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements(); ) {
                     InetAddress inetAddress = inetAddresses.nextElement();
                     if (inetAddress.isLoopbackAddress() || inetAddress instanceof Inet6Address) {
                         continue;