diff --git a/tools/kf5-lib-prefix-rename b/tools/kf5-lib-prefix-rename
index 9c9f3bd50..f702a4fe4 100755
--- a/tools/kf5-lib-prefix-rename
+++ b/tools/kf5-lib-prefix-rename
@@ -22,6 +22,8 @@ def replace_all(path):
     # tier1
     txt = replace_one(txt, "Archive")
     txt = replace_one(txt, "Codecs")
+    txt = replace_one(txt, "ConfigCore")
+    txt = replace_one(txt, "ConfigGui")
     txt = replace_one(txt, "Config")
     txt = replace_one(txt, "CoreAddons")
     txt = replace_one(txt, "DBusAddons")
@@ -32,11 +34,12 @@ def replace_all(path):
     txt = replace_one(txt, "JS")
     txt = replace_one(txt, "JobWidgets")
     txt = replace_one(txt, "Plotting")
-    txt = replace_one(txt, "Solid")
-    txt = replace_one(txt, "Sonnet")
+    txt = replace_one(txt, "Solid", "Solid")
+    txt = replace_one(txt, "Sonnet", "Sonnet")
     txt = replace_one(txt, "ThreadWeaver", "ThreadWeaver")
     txt = replace_one(txt, "WidgetsAddons")
     txt = replace_one(txt, "WindowSystem")
+    txt = replace_one(txt, "GlobalAccel", "KF5GlobalAccel")
     # tier2
     txt = replace_one(txt, "DNSSD")
     txt = replace_one(txt, "Auth")
@@ -55,6 +58,7 @@ def replace_all(path):
     txt = replace_one(txt, "KIOCore", "KIOCore")
     txt = replace_one(txt, "KIOFileWidgets", "KIOFileWidgets")
     txt = replace_one(txt, "KIOWidgets", "KIOWidgets")
+    txt = replace_one(txt, "KIO", "KIO")
     txt = replace_one(txt, "Kross", "Kross")
     txt = replace_one(txt, "KF5Su", "KDESu")
     txt = replace_one(txt, "WebKit")