diff --git a/modules/accounts/kaccounts.desktop b/modules/accounts/kaccounts.desktop
index 482c47e..6fd2f44 100644
--- a/modules/accounts/kaccounts.desktop
+++ b/modules/accounts/kaccounts.desktop
@@ -1,90 +1,88 @@
 [Desktop Entry]
 Name=Accounts
 Name[ca]=Comptes
 Name[ca@valencia]=Comptes
 Name[cs]=Účty
 Name[da]=Konti
 Name[de]=Zugänge
 Name[el]=Λογαριασμοί
 Name[en_GB]=Accounts
 Name[es]=Cuentas
 Name[fi]=Tilit
 Name[fr]=Comptes
 Name[gl]=Contas
 Name[it]=Account
 Name[ko]=계정
 Name[nl]=Accounts
 Name[nn]=Kontoar
 Name[pl]=Konta
 Name[pt]=Contas
 Name[pt_BR]=Contas
 Name[sk]=Účty
 Name[sl]=Računi
 Name[sv]=Konton
 Name[uk]=Облікові записи
 Name[x-test]=xxAccountsxx
 Name[zh_CN]=帐户
 Comment=Add Your Online Accounts
 Comment[ca]=Afegiu els vostres comptes en línia
 Comment[ca@valencia]=Afegiu els vostres comptes en línia
 Comment[cs]=Přidejte svoje účty online
 Comment[da]=Tilføj dine onlinekonti
 Comment[de]=Fügen Sie Ihre Online-Zugänge hinzu
 Comment[el]=Προσθέστε τους διαδικτυακούς σας λογαριασμούς
 Comment[en_GB]=Add Your Online Accounts
 Comment[es]=Añadir cuentas en línea
 Comment[fi]=Lisää verkkotilisi
 Comment[fr]=Ajouter vos comptes en ligne
 Comment[gl]=Engadir as contas de internet
 Comment[it]=Aggiungi i tuoi account online
 Comment[ko]=내 온라인 계정 추가
 Comment[nl]=Uw online accounts toevoegen
 Comment[nn]=Legg til nettkontoar
 Comment[pl]=Dodaj swoje konta internetowe
 Comment[pt]=Adicionar as Suas Contas 'Online'
 Comment[pt_BR]=Adicione suas contas online
 Comment[sl]=Dodajte vaše spletne račune
 Comment[sv]=Lägg till dina nätkonton
 Comment[uk]=Додавання ваших облікових записів
 Comment[x-test]=xxAdd Your Online Accountsxx
 Comment[zh_CN]=添加您的在线帐号
 
 Icon=applications-internet
-Exec=plasma-settings -m kaccounts
-#Exec=plasma-settings -m kcm_mobile_power
+Exec=plasma-settings -m kcm_mobile_kaccounts
 
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
 X-KDE-ParentApp=kcontrol
 X-KDE-FormFactors=handset,tablet,mediacenter
 
 X-KDE-System-Settings-Parent-Category=display
 X-KDE-Weight=70
 
 X-KDE-Keywords=accounts, online
 X-KDE-Keywords[ca]=comptes,en línia
 X-KDE-Keywords[ca@valencia]=comptes,en línia
 X-KDE-Keywords[cs]=účty, online
 X-KDE-Keywords[da]=konti, online
 X-KDE-Keywords[de]=accounts, online, zugang
 X-KDE-Keywords[el]=λογαριασμοί, διαδικτυακοί
 X-KDE-Keywords[en_GB]=accounts, online
 X-KDE-Keywords[es]=cuentas, en línea
 X-KDE-Keywords[fi]=tilit, verkko
 X-KDE-Keywords[fr]=comptes, en ligne
 X-KDE-Keywords[gl]=contas, internet
 X-KDE-Keywords[it]=account, online
 X-KDE-Keywords[ko]=accounts, online, 계정, 온라인
 X-KDE-Keywords[nl]=accounts, online
 X-KDE-Keywords[nn]=kontoar, nett, Internett, tilkopla
 X-KDE-Keywords[pl]=konta,internet,online
 X-KDE-Keywords[pt]=contas, online
 X-KDE-Keywords[pt_BR]=contas, online
 X-KDE-Keywords[sl]=računi,splet
 X-KDE-Keywords[sv]=konton, uppkoppling
 X-KDE-Keywords[uk]=облікові записи,мережа,accounts,online
 X-KDE-Keywords[x-test]=xxaccountsxx,xx onlinexx
 X-KDE-Keywords[zh_CN]=accounts, online, 账户, 在线
 Categories=Qt;KDE;X-KDE-settings-system;
-
diff --git a/modules/accounts/package/metadata.desktop b/modules/accounts/package/metadata.desktop
index 1e93384..ecf4c71 100644
--- a/modules/accounts/package/metadata.desktop
+++ b/modules/accounts/package/metadata.desktop
@@ -1,66 +1,66 @@
 [Desktop Entry]
 Name=Accounts
 Name[ca]=Comptes
 Name[ca@valencia]=Comptes
 Name[cs]=Účty
 Name[da]=Konti
 Name[de]=Zugänge
 Name[el]=Λογαριασμοί
 Name[en_GB]=Accounts
 Name[es]=Cuentas
 Name[fi]=Tilit
 Name[fr]=Comptes
 Name[gl]=Contas
 Name[it]=Account
 Name[ko]=계정
 Name[nl]=Accounts
 Name[nn]=Kontoar
 Name[pl]=Konta
 Name[pt]=Contas
 Name[pt_BR]=Contas
 Name[sk]=Účty
 Name[sl]=Računi
 Name[sv]=Konton
 Name[uk]=Облікові записи
 Name[x-test]=xxAccountsxx
 Name[zh_CN]=帐户
 Comment=Add Your Online Accounts
 Comment[ca]=Afegiu els vostres comptes en línia
 Comment[ca@valencia]=Afegiu els vostres comptes en línia
 Comment[cs]=Přidejte svoje účty online
 Comment[da]=Tilføj dine onlinekonti
 Comment[de]=Fügen Sie Ihre Online-Zugänge hinzu
 Comment[el]=Προσθέστε τους διαδικτυακούς σας λογαριασμούς
 Comment[en_GB]=Add Your Online Accounts
 Comment[es]=Añadir cuentas en línea
 Comment[fi]=Lisää verkkotilisi
 Comment[fr]=Ajouter vos comptes en ligne
 Comment[gl]=Engadir as contas de internet
 Comment[it]=Aggiungi i tuoi account online
 Comment[ko]=내 온라인 계정 추가
 Comment[nl]=Uw online accounts toevoegen
 Comment[nn]=Legg til nettkontoar
 Comment[pl]=Dodaj swoje konta internetowe
 Comment[pt]=Adicionar as Suas Contas 'Online'
 Comment[pt_BR]=Adicione suas contas online
 Comment[sl]=Dodajte vaše spletne račune
 Comment[sv]=Lägg till dina nätkonton
 Comment[uk]=Додавання ваших облікових записів
 Comment[x-test]=xxAdd Your Online Accountsxx
 Comment[zh_CN]=添加您的在线帐号
 
 Encoding=UTF-8
 Type=Service
 Icon=applications-internet
 X-KDE-ServiceTypes=Active/SettingsModule
 X-KDE-PluginInfo-Author=Martin Klapetek
 X-KDE-PluginInfo-Email=mklapetek@kde.org
-X-KDE-PluginInfo-Name=kaccounts
+X-KDE-PluginInfo-Name=kcm_mobile_kaccounts
 X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Website=http://kde.org
+X-KDE-PluginInfo-Website=https://plasma-mobile.org
 X-KDE-PluginInfo-Category=Network
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-FormFactors=handset,tablet,mediacenter
 X-Plasma-MainScript=ui/Accounts.qml