diff --git a/metadata/de.j4velin.wifiAutoOff.txt b/metadata/de.j4velin.wifiAutoOff.txt
index 886820e338..e80267160b 100644
--- a/metadata/de.j4velin.wifiAutoOff.txt
+++ b/metadata/de.j4velin.wifiAutoOff.txt
@@ -1,8 +1,8 @@
 Categories:Connectivity
 License:Apache-2.0
-Web Site:https://github.com/j4velin/WiFi-Auto-Off/blob/HEAD/README.md
-Source Code:https://github.com/j4velin/WiFi-Auto-Off
-Issue Tracker:https://github.com/j4velin/WiFi-Auto-Off/issues
+Web Site:https://github.com/j4velin/WiFi-Automatic/blob/HEAD/README.md
+Source Code:https://github.com/j4velin/WiFi-Automatic
+Issue Tracker:https://github.com/j4velin/WiFi-Automatic/issues
 
 Auto Name:WiFi Automatic
 Summary:Turn off WiFi automatically
@@ -26,7 +26,7 @@ power than staying on WiFi.
 .
 
 Repo Type:git
-Repo:https://github.com/j4velin/WiFi-Auto-Off.git
+Repo:https://github.com/j4velin/WiFi-Automatic.git
 
 Build:1.3.1,8
     commit=b93697dd4fca0967e31ee84bc3a15573a09243a9
diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt
index 69846d338e..5267361000 100644
--- a/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@ -1,7 +1,7 @@
 Categories:Science & Education
 License:GPL-3.0-or-later
 Web Site:http://staticfree.info/projects/units
-Source Code:https://staticfree.info/git/Units.git
+Source Code:https://github.com/xxv/Units
 Issue Tracker:https://github.com/xxv/units/issues
 FlattrID:86174
 
@@ -12,7 +12,7 @@ A powerful unit-aware calculator and converter inspired by GNU Units.
 .
 
 Repo Type:git
-Repo:git://staticfree.info/git/Units/
+Repo:https://github.com/xxv/Units
 
 Build:0.8,7
     commit=8be8c10c67152783b6871a70d077a0758e5086ba
diff --git a/metadata/ohi.andre.consolelauncher.txt b/metadata/ohi.andre.consolelauncher.txt
index 815a6483f6..d6a68f0dc2 100644
--- a/metadata/ohi.andre.consolelauncher.txt
+++ b/metadata/ohi.andre.consolelauncher.txt
@@ -1,8 +1,8 @@
 Categories:System
 License:Apache-2.0
 Web Site:http://forum.xda-developers.com/android/apps-games/t-ui-terminal-console-launcher-t3146288/post61606911
-Source Code:https://github.com/Andre1299/TUI-ConsoleLauncher
-Issue Tracker:https://github.com/Andre1299/TUI-ConsoleLauncher/issues
+Source Code:https://github.com/fAndreuzzi/TUI-ConsoleLauncher
+Issue Tracker:https://github.com/fAndreuzzi/TUI-ConsoleLauncher/issues
 
 Auto Name:T-UI
 Summary:Terminal based launcher
@@ -41,7 +41,7 @@ You have to manually allow permissions.
 .
 
 Repo Type:git
-Repo:https://github.com/Andre1299/TUI-ConsoleLauncher
+Repo:https://github.com/fAndreuzzi/TUI-ConsoleLauncher
 
 Build:4.1,66
     disable=remove apk, sort out deps
diff --git a/metadata/org.developfreedom.wordpowermadeeasy.txt b/metadata/org.developfreedom.wordpowermadeeasy.txt
index ed255c17c7..583f8ca145 100644
--- a/metadata/org.developfreedom.wordpowermadeeasy.txt
+++ b/metadata/org.developfreedom.wordpowermadeeasy.txt
@@ -1,8 +1,8 @@
 Categories:Reading
 License:GPL-3.0-only
 Web Site:http://developfreedom.com
-Source Code:https://github.com/shubhamchaudhary/wordpowermadeeasy
-Issue Tracker:https://github.com/shubhamchaudhary/wordpowermadeeasy/issues
+Source Code:https://github.com/ylogx/wordpowermadeeasy
+Issue Tracker:https://github.com/ylogx/wordpowermadeeasy/issues
 
 Auto Name:Word Power Made Easy
 Summary:Build your vocabualary
@@ -12,7 +12,7 @@ SAT, GRE and GMAT course materials.
 .
 
 Repo Type:git
-Repo:https://github.com/shubhamchaudhary/wordpowermadeeasy.git
+Repo:https://github.com/ylogx/wordpowermadeeasy.git
 
 Build:0.1.3,13
     commit=v0.1.3
diff --git a/metadata/org.traccar.client.txt b/metadata/org.traccar.client.txt
index 0165842270..82be1dc7bd 100644
--- a/metadata/org.traccar.client.txt
+++ b/metadata/org.traccar.client.txt
@@ -1,8 +1,8 @@
 Categories:Navigation
 License:Apache-2.0
 Web Site:https://www.traccar.org
-Source Code:https://github.com/tananaev/traccar-client-android
-Issue Tracker:https://github.com/tananaev/traccar-client-android/issues
+Source Code:https://github.com/traccar/traccar-client-android
+Issue Tracker:https://github.com/traccar/traccar-client-android/issues
 Donate:http://www.traccar.org/donate.jsp
 
 Auto Name:Traccar Client
@@ -13,7 +13,7 @@ it out and the results can be viewed in a browser.
 .
 
 Repo Type:git
-Repo:https://github.com/tananaev/traccar-client-android.git
+Repo:https://github.com/traccar/traccar-client-android.git
 
 Build:2.7,14
     commit=10745c
diff --git a/metadata/ru.equestriadev.mgke.txt b/metadata/ru.equestriadev.mgke.txt
index adff90ae27..074419cda2 100644
--- a/metadata/ru.equestriadev.mgke.txt
+++ b/metadata/ru.equestriadev.mgke.txt
@@ -1,8 +1,8 @@
 Categories:Time
 License:MIT
-Web Site:https://github.com/bronydell/MGKE_Android_App/blob/HEAD/README.md
-Source Code:https://github.com/bronydell/MGKE_Android_App
-Issue Tracker:https://github.com/bronydell/MGKE_Android_App/issues
+Web Site:https://github.com/bronydell/Android-MGKEapp/blob/HEAD/README.md
+Source Code:https://github.com/bronydell/Android-MGKEapp
+Issue Tracker:https://github.com/bronydell/Android-MGKEapp/issues
 
 Auto Name:Расписание МГКЭ
 Summary:Track updates of schedule on college site
@@ -11,7 +11,7 @@ Tracks updates of schedule on college site and shows it in the app.
 .
 
 Repo Type:git
-Repo:https://github.com/bronydell/MGKE_Android_App
+Repo:https://github.com/bronydell/Android-MGKEapp
 
 Build:3.0.5 Release,24
     commit=b3043a462f92aa9a97a9f4ac5d91a734d914fc72