settings: system-settings -> settings

57 files changed, 50 insertions, 50 deletions

diff --git a/configure.ac b/configure.ac
index 4dfda03575..1a2c16ad92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -518,7 +518,7 @@ src/ppp-manager/Makefile
 src/dnsmasq-manager/Makefile
 src/modem-manager/Makefile
 src/bluez-manager/Makefile
-src/system-settings/Makefile
+src/settings/Makefile
 src/backends/Makefile
 libnm-util/libnm-util.pc
 libnm-util/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a7a3ecb484..d4d8c4b1e6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,7 +18,7 @@ src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-manager.c
 src/logging/nm-logging.c
 src/dns-manager/nm-dns-manager.c
-src/system-settings/nm-default-wired-connection.c
+src/settings/nm-default-wired-connection.c
 system-settings/plugins/ifcfg-rh/reader.c
 system-settings/plugins/ifnet/connection_parser.c
 
diff --git a/po/as.po b/po/as.po
index 46e41809b6..78a2cd3a90 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1598,7 +1598,7 @@ msgstr "মন কৰিব: libc resolver ৰ দ্বাৰা ৩ তকৈ
 msgid "The nameservers listed below may not be recognized."
 msgstr "নিম্নলিখিত নাম-সেৱকসমূহ চিনাক্ত ন'হ'বও পাৰে  ।"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "স্বয়ংক্ৰিয় %s"
diff --git a/po/bg.po b/po/bg.po
index 5a1e7c1c08..578cee9d00 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1877,7 +1877,7 @@ msgstr "ЗАБЕЛЕЖКА: libc може да не поддържа повеч�
 msgid "The nameservers listed below may not be recognized."
 msgstr "Долните сървъри за имена може да не бъдат разпознати."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Автоматично %s"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index cf275dad69..372d7bb2a7 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1597,7 +1597,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "নিম্নলিখিত নেম-সার্ভারগুলি সনাক্ত না হওয়ার সম্ভাবনা রয়েছে।"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "স্বয়ংক্রিয় %s"
diff --git a/po/cs.po b/po/cs.po
index 4c59825e84..d541b58601 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Jmenné servery uvedené v následujícím seznamu nelze rozpoznat."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "%s (automaticky)"
diff --git a/po/de.po b/po/de.po
index 07a6a3b242..90de5c22ec 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1809,7 +1809,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/el.po b/po/el.po
index cb9fa186b0..c6db6f79bf 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1773,7 +1773,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως να μην αναγνωρίζονται."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Αυτόματο %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index ef279f8fab..528f915c2f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -326,7 +326,7 @@ msgstr "NOTE: the libc resolver may not support more than 3 nameservers."
 msgid "The nameservers listed below may not be recognized."
 msgstr "The nameservers listed below may not be recognised."
 
-#: ../src/system-settings/nm-default-wired-connection.c:194
+#: ../src/settings/nm-default-wired-connection.c:194
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/es.po b/po/es.po
index 74746f4a46..2ef45cbca2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1768,7 +1768,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/eu.po b/po/eu.po
index 5a584ec367..68b8204a4b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1308,7 +1308,7 @@ msgstr "OHARRA: libc-en ebaztaileak ez du 3 izen-zerbitzari baino gehiago onartz
 msgid "The nameservers listed below may not be recognized."
 msgstr "Azpian zerrendatutako izen-zenbitzariak ez dira ezagutuko."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/fr.po b/po/fr.po
index 25b6c76b8b..6aa67c8c28 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1621,7 +1621,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Les serveurs de noms listés ci-dessous peuvent ne pas être reconnus."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/gl.po b/po/gl.po
index 4adefda785..62dc71f3fe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1732,7 +1732,7 @@ msgstr "NOTE: o importador libc non permite máis de 3 nomes de servidores."
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os nomes de servidores listados a seguir poden non ser recoñecidos"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/gu.po b/po/gu.po
index 3fa8cf3333..68c97d7152 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1596,7 +1596,7 @@ msgstr "નોંધ: libc સુધારનાર એ ૩ નામ સર્�
 msgid "The nameservers listed below may not be recognized."
 msgstr "નીચે યાદી થયેલ નામસર્વરો એ ઓળખી શકાતા નથી."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "%s સ્વયં કરો"
diff --git a/po/hi.po b/po/hi.po
index aab5c03467..59b00c4a87 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1691,7 +1691,7 @@ msgstr "नोट: libc समाधानकर्ता 3 नेमसर्�
 msgid "The nameservers listed below may not be recognized."
 msgstr "नीचे सूची में दिया गया नेमसर्वर पहचाना नहीं जा सकता है."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "स्वतः %s"
diff --git a/po/hu.po b/po/hu.po
index 0ca4386f29..942b17b1e5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1780,7 +1780,7 @@ msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgá
 msgid "The nameservers listed below may not be recognized."
 msgstr "Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automatikus %s"
diff --git a/po/id.po b/po/id.po
index b88792905f..e8adc15101 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1706,7 +1706,7 @@ msgstr "CATATAN: resolver libc mungkin tak mendukung lebih dari 3 nameserver."
 msgid "The nameservers listed below may not be recognized."
 msgstr "Nameserver yang terdaftar di bawah mungkin tak dikenali."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Otomatis %s"
diff --git a/po/it.po b/po/it.po
index dd24604d56..08de04994e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1610,7 +1610,7 @@ msgstr "NOTA: il risolutore libc non supporta più di 3 server di nomi."
 msgid "The nameservers listed below may not be recognized."
 msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "%s (automatica)"
diff --git a/po/ja.po b/po/ja.po
index 4b49f0089c..37f0e82965 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1598,7 +1598,7 @@ msgstr "注記: libc リゾルバは ３つ以上のネームサーバーをサ�
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "自動 %s"
diff --git a/po/kn.po b/po/kn.po
index 54769baa77..6d172a0d7f 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1700,7 +1700,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ಸ್ವಯಂ %s"
diff --git a/po/ko.po b/po/ko.po
index e2cc426bca..20b749afd6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1598,7 +1598,7 @@ msgstr "주의: libc 주소 검색은 3개를 초과하는 네임서버를 지�
 msgid "The nameservers listed below may not be recognized."
 msgstr "아래 열거된 네임서버를 인식하지 못할 수 있습니다."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "자동 %s"
diff --git a/po/lt.po b/po/lt.po
index 6c1d170c31..2de5aed615 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1696,7 +1696,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automatinis %s"
diff --git a/po/ml.po b/po/ml.po
index 0d9796f9fe..59b0b0f262 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1594,7 +1594,7 @@ msgstr "കുറിപ്പു്: libc റിസോള്‍വര്‍ 3 �
 msgid "The nameservers listed below may not be recognized."
 msgstr "താഴെ പറഞ്ഞിരിക്കുന്ന നെയിംസര്‍വറുകള്‍ തിരിച്ചറിയപ്പെടുന്നവയല്ല."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ഓട്ടോ %s"
diff --git a/po/mr.po b/po/mr.po
index 67335ad2e3..03f93b2724 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1680,7 +1680,7 @@ msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्
 msgid "The nameservers listed below may not be recognized."
 msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "स्वयं %s"
diff --git a/po/or.po b/po/or.po
index bba0d598c7..32eb1aa11f 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1696,7 +1696,7 @@ msgstr "ଟିପ୍ପଣୀ: libc resolver 3 ରୁ ଅଧିକ nameserverଗ
 msgid "The nameservers listed below may not be recognized."
 msgstr "ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ nameserverଗୁଡ଼ିକୁ ଚିହ୍ନି ହୋଇନପାରେ."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ସ୍ୱୟଂ %s"
diff --git a/po/pa.po b/po/pa.po
index cf3777a70b..87092b0f3c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1755,7 +1755,7 @@ msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇ�
 msgid "The nameservers listed below may not be recognized."
 msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "ਆਟੋ %s"
diff --git a/po/pl.po b/po/pl.po
index f1b0650d04..58ad3e7e55 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1780,7 +1780,7 @@ msgstr "UWAGA: obsługa nazw libc nie obsługuje więcej niż 3 serwery nazw."
 msgid "The nameservers listed below may not be recognized."
 msgstr "Poniższe serwery nazw nie mogą nie zostać rozpoznane."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automatyczne %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 40919e8a6b..3b364b50b5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1321,7 +1321,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Os servidores de nomes listados abaixo podem não ser reconhecidos."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
diff --git a/po/ru.po b/po/ru.po
index 2595ab3c6b..5dc18f3832 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1604,7 +1604,7 @@ msgstr ""
 msgid "The nameservers listed below may not be recognized."
 msgstr "Нижеперечисленные сервера могут быть пропущены."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Авто %s"
diff --git a/po/sl.po b/po/sl.po
index cb37ee828a..33af9c1e5b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1839,7 +1839,7 @@ msgstr "OPOMBA: razreševalnik libc morda ne podpira več kot 3 imenskih strežn
 msgid "The nameservers listed below may not be recognized."
 msgstr "Navedeni imenski strežniki morda ne bodo prepoznani."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Samodejno %s"
diff --git a/po/sv.po b/po/sv.po
index dc9869ed1f..590abfae02 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1857,7 +1857,7 @@ msgstr "OBSERVERA: uppslag via glibc kanske inte har stöd för fler än 3 namns
 msgid "The nameservers listed below may not be recognized."
 msgstr "Namnservrarna listade nedan kanske inte kommer att kännas igen."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "Automatisk %s"
diff --git a/po/ta.po b/po/ta.po
index 8ab5caeb63..44125c38bb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1602,7 +1602,7 @@ msgstr "குறிப்பு: இந்த libc மறுதீர்வா�
 msgid "The nameservers listed below may not be recognized."
 msgstr "கீழே பட்டியலிட்டப்படுள்ள பெயர்சேவையகங்கள் கண்டுபிடிக்கப்படவில்லை."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "தானியக்கி %s"
diff --git a/po/te.po b/po/te.po
index cf05561417..a8d55575c4 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1689,7 +1689,7 @@ msgstr "గమనిక: libc రిజాల్వర్ 3 నామపు స�
 msgid "The nameservers listed below may not be recognized."
 msgstr "క్రిందన జాబితాచేసివున్న నామపుసేవికలు గుర్తించబడక పోవచ్చును."
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "స్వయంచాలక %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 81e2e6b6a2..5f4b64f4c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1690,7 +1690,7 @@ msgstr "注意：libc 解析器可能不支持超过三个名字服务器。"
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下列出的名字服务器可能无法被识别。"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "自动 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 25e81bbe1b..d6e530fdf3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1599,7 +1599,7 @@ msgstr "注意：libc 解析器不支援 3 個以上的名稱伺服器。"
 msgid "The nameservers listed below may not be recognized."
 msgstr "下面列出的名稱伺服器可能不會被辨識。"
 
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
 #, c-format
 msgid "Auto %s"
 msgstr "自動 %s"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f42b7ab05..aab9ce65ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS= \
 	dnsmasq-manager \
 	modem-manager \
 	bluez-manager \
-	system-settings \
+	settings \
 	. \
 	tests
 
@@ -26,7 +26,7 @@ INCLUDES = -I${top_srcdir}                   \
            -I${top_srcdir}/src/dnsmasq-manager  \
            -I${top_srcdir}/src/modem-manager  \
            -I$(top_srcdir)/src/bluez-manager \
-           -I$(top_srcdir)/src/system-settings \
+           -I$(top_srcdir)/src/settings \
            -I${top_srcdir}/libnm-util \
            -I${top_srcdir}/libnm-glib \
            -I${top_srcdir}/callouts
@@ -239,7 +239,7 @@ NetworkManager_LDADD = \
 	./ppp-manager/libppp-manager.la \
 	./modem-manager/libmodem-manager.la \
 	./bluez-manager/libbluez-manager.la \
-	./system-settings/libsystem-settings.la \
+	./settings/libsettings.la \
 	./backends/libnmbackend.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
diff --git a/src/nm-policy.c b/src/nm-policy.c
index a341241400..25a64ab67d 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -330,7 +330,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 
 	/* Hostname precedence order:
 	 *
-	 * 1) a configured hostname (from system-settings)
+	 * 1) a configured hostname (from settings)
 	 * 2) automatic hostname from the default device's config (DHCP, VPN, etc)
 	 * 3) the original hostname when NM started
 	 * 4) reverse-DNS of the best device's IPv4 address
diff --git a/src/system-settings/Makefile.am b/src/settings/Makefile.am
index 1a8bc66cf3..3841750055 100644
--- a/src/system-settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -6,13 +6,13 @@ INCLUDES = -I${top_srcdir} \
            -I${top_srcdir}/src \
            -I${top_builddir}/marshallers
 
-noinst_LTLIBRARIES = libsystem-settings.la
+noinst_LTLIBRARIES = libsettings.la
 
 BUILT_SOURCES = \
 	nm-settings-glue.h \
 	nm-sysconfig-connection-glue.h
 
-libsystem_settings_la_SOURCES = \
+libsettings_la_SOURCES = \
 	nm-settings.c \
 	nm-settings.h \
 	nm-inotify-helper.c \
@@ -27,7 +27,7 @@ libsystem_settings_la_SOURCES = \
 	nm-default-wired-connection.c \
 	nm-default-wired-connection.h
 
-libsystem_settings_la_CPPFLAGS = \
+libsettings_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS) \
@@ -42,7 +42,7 @@ libsystem_settings_la_CPPFLAGS = \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
 	-DPLUGINDIR=\"$(pkglibdir)\"
 
-libsystem_settings_la_LIBADD = \
+libsettings_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	$(top_builddir)/marshallers/libmarshallers.la \
@@ -52,7 +52,7 @@ libsystem_settings_la_LIBADD = \
 	$(GMODULE_LIBS) \
 	$(POLKIT_LIBS)
 
-libsystem_settings_la_LDFLAGS = -rdynamic
+libsettings_la_LDFLAGS = -rdynamic
 
 
 nm-settings-glue.h: $(top_srcdir)/introspection/nm-settings.xml
diff --git a/src/system-settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c
index b2c22baf3c..b2c22baf3c 100644
--- a/src/system-settings/nm-default-wired-connection.c
+++ b/src/settings/nm-default-wired-connection.c
diff --git a/src/system-settings/nm-default-wired-connection.h b/src/settings/nm-default-wired-connection.h
index de89b67567..de89b67567 100644
--- a/src/system-settings/nm-default-wired-connection.h
+++ b/src/settings/nm-default-wired-connection.h
diff --git a/src/system-settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c
index 0ee168e542..0ee168e542 100644
--- a/src/system-settings/nm-inotify-helper.c
+++ b/src/settings/nm-inotify-helper.c
diff --git a/src/system-settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h
index 10d43ac99f..10d43ac99f 100644
--- a/src/system-settings/nm-inotify-helper.h
+++ b/src/settings/nm-inotify-helper.h
diff --git a/src/system-settings/nm-polkit-helpers.h b/src/settings/nm-polkit-helpers.h
index dfe9ecefc3..dfe9ecefc3 100644
--- a/src/system-settings/nm-polkit-helpers.h
+++ b/src/settings/nm-polkit-helpers.h
diff --git a/src/system-settings/nm-settings.c b/src/settings/nm-settings.c
index ba7375eba3..ba7375eba3 100644
--- a/src/system-settings/nm-settings.c
+++ b/src/settings/nm-settings.c
diff --git a/src/system-settings/nm-settings.h b/src/settings/nm-settings.h
index 51c454fd99..51c454fd99 100644
--- a/src/system-settings/nm-settings.h
+++ b/src/settings/nm-settings.h
diff --git a/src/system-settings/nm-sysconfig-connection.c b/src/settings/nm-sysconfig-connection.c
index 759f1f3a6a..759f1f3a6a 100644
--- a/src/system-settings/nm-sysconfig-connection.c
+++ b/src/settings/nm-sysconfig-connection.c
diff --git a/src/system-settings/nm-sysconfig-connection.h b/src/settings/nm-sysconfig-connection.h
index ca2df95316..ca2df95316 100644
--- a/src/system-settings/nm-sysconfig-connection.h
+++ b/src/settings/nm-sysconfig-connection.h
diff --git a/src/system-settings/nm-system-config-error.c b/src/settings/nm-system-config-error.c
index a4e52a6b60..a4e52a6b60 100644
--- a/src/system-settings/nm-system-config-error.c
+++ b/src/settings/nm-system-config-error.c
diff --git a/src/system-settings/nm-system-config-error.h b/src/settings/nm-system-config-error.h
index 82753fde03..82753fde03 100644
--- a/src/system-settings/nm-system-config-error.h
+++ b/src/settings/nm-system-config-error.h
diff --git a/src/system-settings/nm-system-config-interface.c b/src/settings/nm-system-config-interface.c
index f522a9b44c..f522a9b44c 100644
--- a/src/system-settings/nm-system-config-interface.c
+++ b/src/settings/nm-system-config-interface.c
diff --git a/src/system-settings/nm-system-config-interface.h b/src/settings/nm-system-config-interface.h
index 439586a408..439586a408 100644
--- a/src/system-settings/nm-system-config-interface.h
+++ b/src/settings/nm-system-config-interface.h
diff --git a/system-settings/plugins/ifcfg-rh/Makefile.am b/system-settings/plugins/ifcfg-rh/Makefile.am
index 54d686bb48..9874d352ba 100644
--- a/system-settings/plugins/ifcfg-rh/Makefile.am
+++ b/system-settings/plugins/ifcfg-rh/Makefile.am
@@ -23,7 +23,7 @@ libifcfg_rh_io_la_SOURCES = \
 	utils.h
 
 INCLUDES = \
-	-I$(top_srcdir)/src/system-settings \
+	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/system-settings/plugins/ifcfg-suse/Makefile.am
index f28f57f791..3db8ed31d4 100644
--- a/system-settings/plugins/ifcfg-suse/Makefile.am
+++ b/system-settings/plugins/ifcfg-suse/Makefile.am
@@ -10,7 +10,7 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
 	$(GMODULE_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
-	-I${top_srcdir}/src/system-settings \
+	-I${top_srcdir}/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am
index f63f8ca710..52056ffda2 100644
--- a/system-settings/plugins/ifnet/Makefile.am
+++ b/system-settings/plugins/ifnet/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . tests
 INCLUDES = \
-	-I$(top_srcdir)/src/system-settings \
+	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util
diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am
index ead3f1fc4f..42a91d60c1 100644
--- a/system-settings/plugins/ifnet/tests/Makefile.am
+++ b/system-settings/plugins/ifnet/tests/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\
 	 -I$(top_srcdir)/libnm-glib \
 	 -I$(top_srcdir)/libnm-util \
 	 -I$(top_srcdir)/include \
-	 -I$(top_srcdir)/src/system-settings
+	 -I$(top_srcdir)/src/settings
 TESTS = check_ifnet
 check_PROGRAMS = check_ifnet
 check_ifnet_SOURCES = test_all.c 
diff --git a/system-settings/plugins/ifupdown/Makefile.am b/system-settings/plugins/ifupdown/Makefile.am
index 652e545fce..1bbcc19282 100644
--- a/system-settings/plugins/ifupdown/Makefile.am
+++ b/system-settings/plugins/ifupdown/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=. tests
 
 INCLUDES = \
-	-I$(top_srcdir)/src/system-settings \
+	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util
diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am
index 1c1fd4a7de..5052a63068 100644
--- a/system-settings/plugins/keyfile/Makefile.am
+++ b/system-settings/plugins/keyfile/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=. tests
 
 INCLUDES = \
-	-I$(top_srcdir)/src/system-settings \
+	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib