diff --git a/po/POTFILES b/po/POTFILES
index ba129c6437da4feb9b208849aa643d7548eb4504..1a2ccc808eae5372e2bc77c19f8daa11c12385ff 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1 +1 @@
-src/EOSConnect.vala
+src/Conecto.vala
diff --git a/src/Conecto/Conecto.vala b/src/Conecto/Conecto.vala
index a31e2f58fa2d2bf038685de6796ac1b3c6a7e23d..bddea480d3dbfe304cceea27a51a7f1bc147674a 100644
--- a/src/Conecto/Conecto.vala
+++ b/src/Conecto/Conecto.vala
@@ -16,14 +16,14 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  * Hannes Schulze <haschu0103 (at) gmail.com>
  */
-using EOSConnect.Plugin;
-using EOSConnect.Plugin.Windows;
-using EOSConnect.Widgets;
+using Conecto.Plugin;
+using Conecto.Plugin.Windows;
+using Conecto.Widgets;
 using Gee;
 using MConnect;
 using Unity;
 
-namespace EOSConnect {
+namespace Conecto {
 
     public class App : Granite.Application {
 
diff --git a/src/Conecto/Config.vala b/src/Conecto/Config.vala
index 434c8f1bd50d9764885f78170350e79edea3c5a7..3edf642afd5ece66c6fe35ed74d7c7966f6adf2f 100644
--- a/src/Conecto/Config.vala
+++ b/src/Conecto/Config.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect {
+namespace Conecto {
 
     public class Config : Object {
 
diff --git a/src/Conecto/Contact.vala b/src/Conecto/Contact.vala
index 4623a7ac8e9b5afe1e699407eef62ea182cd30d7..763e540f212e78fef442345167598fc66cc743be 100644
--- a/src/Conecto/Contact.vala
+++ b/src/Conecto/Contact.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect {
+namespace Conecto {
 
     public class Contact : Object {
 
diff --git a/src/Conecto/ContactsInterface.vala b/src/Conecto/ContactsInterface.vala
index 53341460d1664505641af42a74d75755634b51c6..002fa4716720329799109c9b9c2b283c39a960f4 100644
--- a/src/Conecto/ContactsInterface.vala
+++ b/src/Conecto/ContactsInterface.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect {
+namespace Conecto {
 
     public abstract class ContactsInterface : Object {
 
diff --git a/src/Conecto/Contractor.vala b/src/Conecto/Contractor.vala
index b8bd223acb72984c66d17d57b8ab790664bc3bcb..d1d0cff4eaac53e4d927c9102c2b016063d696b4 100644
--- a/src/Conecto/Contractor.vala
+++ b/src/Conecto/Contractor.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect {
+namespace Conecto {
 
     public class Contractor {
 
@@ -65,8 +65,8 @@ namespace EOSConnect {
                 string str_desc="Description=Send this file to  " + device.custom_name + "\n";
                 // TOCHEK find out why without --print-reply it's not working.
                 string str_command  ="Exec=dbus-send --print-reply --dest=com.github.hannesschulze.conecto ";
-                       str_command += "/com/github/gyan000/eosconnect/share ";
-                       str_command += "com.github.gyan000.eosconnect.Share.Files ";
+                       str_command += "/com/github/hannesschulze/conecto/share ";
+                       str_command += "com.github.hannesschulze.conecto.Share.Files ";
                        str_command += "string:'" + device.id + "' string:'%F'\n";
         		os.write ("[Contractor Entry]\n".data);
                 os.write (str_name.data);
diff --git a/src/Conecto/DebugToolbar.vala b/src/Conecto/DebugToolbar.vala
index ae7760e93f25f49f9e608c6b1a8a1fae3e801b8a..670a87db569a88f3d5d3254cb91917a46557768b 100644
--- a/src/Conecto/DebugToolbar.vala
+++ b/src/Conecto/DebugToolbar.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect {
+namespace Conecto {
 
     public class DebugToolbar : Gtk.Grid {
 
diff --git a/src/Conecto/EContacts.vala b/src/Conecto/EContacts.vala
index 05ab3e98666cd087c1f9641a571bea0784a279b6..176f263a38bc94cde26c42dc4e538ed6c0893435 100644
--- a/src/Conecto/EContacts.vala
+++ b/src/Conecto/EContacts.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect {
+namespace Conecto {
 
     public class EContacts : ContactsInterface {
 
diff --git a/src/Conecto/MainWindow.vala b/src/Conecto/MainWindow.vala
index 2f9723a6325860d737488c4f62280775ff97b364..039d1f21461ef04f543ba57653a1922f3a9965cf 100644
--- a/src/Conecto/MainWindow.vala
+++ b/src/Conecto/MainWindow.vala
@@ -15,14 +15,14 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Plugin;
-using EOSConnect.Plugin.Windows;
-using EOSConnect.Widgets;
+using Conecto.Plugin;
+using Conecto.Plugin.Windows;
+using Conecto.Widgets;
 using Gee;
 using Granite.Widgets;
 using MConnect;
 
-namespace EOSConnect {
+namespace Conecto {
 
     public class MainWindow : Gtk.ApplicationWindow {
 
diff --git a/src/Conecto/Notification.vala b/src/Conecto/Notification.vala
index 2866fb1bcbd497a1feaffb823f9f47f7ad906862..0e7fe4a7e8907281ada49386855de5c27d337488 100644
--- a/src/Conecto/Notification.vala
+++ b/src/Conecto/Notification.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000(at] ijaz.fr>
  */
- namespace EOSConnect {
+ namespace Conecto {
      public class Notification : Object {
         public string id { get; private set; }
         public string app_name { get; private set; }
diff --git a/src/Conecto/Plugin/Battery.vala b/src/Conecto/Plugin/Battery.vala
index 92bf49d58b5ecf3a90e08472b26713da0297d99c..9c97f52a4b6b0515215e65438fb5fd179c3767a9 100644
--- a/src/Conecto/Plugin/Battery.vala
+++ b/src/Conecto/Plugin/Battery.vala
@@ -15,12 +15,12 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Plugin.Popover;
-using EOSConnect.Widgets;
+using Conecto.Plugin.Popover;
+using Conecto.Widgets;
 using Gee;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class Battery : PluginInterface {
 
diff --git a/src/Conecto/Plugin/Dialogs/NotificationSettings.vala b/src/Conecto/Plugin/Dialogs/NotificationSettings.vala
index c63d4275692ac8e388be581beff329462eb7e005..484776e7855530967daaa79ad2a282e84506061b 100644
--- a/src/Conecto/Plugin/Dialogs/NotificationSettings.vala
+++ b/src/Conecto/Plugin/Dialogs/NotificationSettings.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 using MConnect;
 
-namespace EOSConnect.Plugin.Dialogs {
+namespace Conecto.Plugin.Dialogs {
 
     public class NotificationSettings : Gtk.Dialog {
 
diff --git a/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala b/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala
index a642b3c38c011c14d2cca3b50d606f297136a62b..173fd74fc1f5d8168fc62a6a7b2f03f65b5d118c 100644
--- a/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala
+++ b/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala
@@ -15,9 +15,9 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 
-namespace EOSConnect.Plugin.Dialogs {
+namespace Conecto.Plugin.Dialogs {
 
     public class ShareFileInfoProgress : Gtk.Dialog {
 
diff --git a/src/Conecto/Plugin/Notification.vala b/src/Conecto/Plugin/Notification.vala
index a84f73ac419c831b0265a59d6898fbeeaf11b6b9..8351b4b6e3648a748bf556c25dcb26d07f046b09 100644
--- a/src/Conecto/Plugin/Notification.vala
+++ b/src/Conecto/Plugin/Notification.vala
@@ -15,11 +15,11 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Plugin.Dialogs;
+using Conecto.Plugin.Dialogs;
 using Gee;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class @Notification : PluginInterface {
 
diff --git a/src/Conecto/Plugin/Ping.vala b/src/Conecto/Plugin/Ping.vala
index 1d756db36d753c551ee54795fdf6ed7a6ca9b2f9..33c746086f37dc90f2d36e751a56aaf230aad028 100644
--- a/src/Conecto/Plugin/Ping.vala
+++ b/src/Conecto/Plugin/Ping.vala
@@ -15,11 +15,11 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Widgets;
-using EOSConnect.Plugin;
+using Conecto.Widgets;
+using Conecto.Plugin;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class Ping : PluginInterface {
 
diff --git a/src/Conecto/Plugin/PluginInterface.vala b/src/Conecto/Plugin/PluginInterface.vala
index 12c2ad0186be872d8a561f114c6fbf3f6dd22ba1..f5f5d549d6c291453d63272af73883f2cbb3df0d 100644
--- a/src/Conecto/Plugin/PluginInterface.vala
+++ b/src/Conecto/Plugin/PluginInterface.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Widgets;
+using Conecto.Widgets;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public abstract class PluginInterface : GLib.Object {
 
diff --git a/src/Conecto/Plugin/Popover/BatterySettings.vala b/src/Conecto/Plugin/Popover/BatterySettings.vala
index a21187f8c8daab492a2d1e22e3afed544fae29c8..a5eda8446d47f2010738bec7ca9ec36e57f266cd 100644
--- a/src/Conecto/Plugin/Popover/BatterySettings.vala
+++ b/src/Conecto/Plugin/Popover/BatterySettings.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 using MConnect;
 
-namespace EOSConnect.Plugin.Popover {
+namespace Conecto.Plugin.Popover {
 
     public class BatterySettings : Gtk.Popover {
 
diff --git a/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala b/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala
index 6bb0f28405fe5d920ef483bdd1634f0b9dd3b98b..506fb38f62806aec146a1a83e758400e55e400cf 100644
--- a/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala
+++ b/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala
@@ -15,12 +15,12 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
-using EOSConnect.Plugin.Widgets;
+using Conecto;
+using Conecto.Plugin.Widgets;
 using Gee;
 using MConnect;
 
-namespace EOSConnect.Plugin.Popover {
+namespace Conecto.Plugin.Popover {
 
     public class SMSNewMessageNewContact : Gtk.Popover {
 
@@ -83,7 +83,7 @@ namespace EOSConnect.Plugin.Popover {
             SMS sms = new SMS (
                 message,
                 SMS.FROM_ME,
-                SMS.FROM_TYPE_EOSCONNECT,
+                SMS.FROM_TYPE_CONECTO,
                 new DateTime.now_utc ());
 
             if (device.has_capability_handler (TelephonyHandler.TELEPHONY) ) {
diff --git a/src/Conecto/Plugin/Popover/ShareSettings.vala b/src/Conecto/Plugin/Popover/ShareSettings.vala
index d9615ff93209f6e3814b4b1c86495dc36d7640a6..c69e8816661b578efe38d1defc8e246762998a98 100644
--- a/src/Conecto/Plugin/Popover/ShareSettings.vala
+++ b/src/Conecto/Plugin/Popover/ShareSettings.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 using MConnect;
 
-namespace EOSConnect.Plugin.Popover {
+namespace Conecto.Plugin.Popover {
 
     public class ShareSettings : Gtk.Popover {
 
diff --git a/src/Conecto/Plugin/Popover/TelephonySettings.vala b/src/Conecto/Plugin/Popover/TelephonySettings.vala
index a03256fd60504ab5abdf58f0e8effc4cd1ddb377..f28e97dc1c1634ac2cf40f6d3325792438e03a05 100644
--- a/src/Conecto/Plugin/Popover/TelephonySettings.vala
+++ b/src/Conecto/Plugin/Popover/TelephonySettings.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 using MConnect;
 
-namespace EOSConnect.Plugin.Popover {
+namespace Conecto.Plugin.Popover {
 
     public class TelephonySettings : Gtk.Popover {
 
diff --git a/src/Conecto/Plugin/SMS.vala b/src/Conecto/Plugin/SMS.vala
index 26509c7ba8d202d892aab4b5ed5f0df34432fffe..234e4f50a9f2559eb5f5d9a8aed30830986d2e60 100644
--- a/src/Conecto/Plugin/SMS.vala
+++ b/src/Conecto/Plugin/SMS.vala
@@ -15,13 +15,13 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
- namespace EOSConnect.Plugin {
+ namespace Conecto.Plugin {
 
      public class SMS : Object {
 
          public const int FROM_TYPE_TELEPHONY = 1;
          public const int FROM_TYPE_NOTIFICATION = 2;
-         public const int FROM_TYPE_EOSCONNECT = 3;
+         public const int FROM_TYPE_CONECTO = 3;
 
          public const int FROM_CONTACT = 1;
          public const int FROM_ME = 2;
diff --git a/src/Conecto/Plugin/SMSContact.vala b/src/Conecto/Plugin/SMSContact.vala
index 3978bc8370625baaf3ffb42fdaf543e66d454e12..32da043b2133847161c214cc32e3e32acdbdcf63 100644
--- a/src/Conecto/Plugin/SMSContact.vala
+++ b/src/Conecto/Plugin/SMSContact.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class SMSContact : Object {
 
diff --git a/src/Conecto/Plugin/SMSStore.vala b/src/Conecto/Plugin/SMSStore.vala
index 6d1778791e460a1f6c7c62bc3055884152b2c9a6..8dbe5a818461c841e8c69b2798c5e46d78b642bb 100644
--- a/src/Conecto/Plugin/SMSStore.vala
+++ b/src/Conecto/Plugin/SMSStore.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class SMSStore : GLib.Object {
 
diff --git a/src/Conecto/Plugin/SMSStoreFactory.vala b/src/Conecto/Plugin/SMSStoreFactory.vala
index 03e8b472113d0a02648df78c1b932631a7d501a6..ce2e24451c4d60893d6dfaadca596962e8f9d595 100644
--- a/src/Conecto/Plugin/SMSStoreFactory.vala
+++ b/src/Conecto/Plugin/SMSStoreFactory.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public abstract class SMSStoreFactory : Object {
 
diff --git a/src/Conecto/Plugin/SMSStoreInterface.vala b/src/Conecto/Plugin/SMSStoreInterface.vala
index 4c8d72a0b251137ee511df64a0ee119a27269e53..a90eb0cd210b15e468df3389dd96eed0884bcf98 100644
--- a/src/Conecto/Plugin/SMSStoreInterface.vala
+++ b/src/Conecto/Plugin/SMSStoreInterface.vala
@@ -18,7 +18,7 @@
 using Gee;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public abstract class SMSStoreInterface : Object {
 
diff --git a/src/Conecto/Plugin/SMSStoreSQLite.vala b/src/Conecto/Plugin/SMSStoreSQLite.vala
index de164c58768bf4374967de1a886b6f006d315941..e41416f6a6166978bbc22c677d15699ec7f8bd16 100644
--- a/src/Conecto/Plugin/SMSStoreSQLite.vala
+++ b/src/Conecto/Plugin/SMSStoreSQLite.vala
@@ -19,7 +19,7 @@ using Gee;
 using MConnect;
 using Sqlite;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class SMSStoreSQLite : SMSStoreInterface {
 
diff --git a/src/Conecto/Plugin/SMSStoreTemp.vala b/src/Conecto/Plugin/SMSStoreTemp.vala
index f4575feac3009e23d52f3651b71a2521e60fbdc7..a224c05bd69ca0a7421f83c73cc0354647b2803e 100644
--- a/src/Conecto/Plugin/SMSStoreTemp.vala
+++ b/src/Conecto/Plugin/SMSStoreTemp.vala
@@ -18,7 +18,7 @@
 using MConnect;
 using Sqlite;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class SMSStoreTemp : SMSStoreInterface {
 
diff --git a/src/Conecto/Plugin/Share.vala b/src/Conecto/Plugin/Share.vala
index 98a8135750284683d513ac8c77f47c431e6dee22..210805ca27ce900a3d267a68e4ba71721fda3e98 100644
--- a/src/Conecto/Plugin/Share.vala
+++ b/src/Conecto/Plugin/Share.vala
@@ -15,13 +15,13 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Plugin.Popover;
-using EOSConnect.Plugin.Dialogs;
-using EOSConnect.Widgets;
+using Conecto.Plugin.Popover;
+using Conecto.Plugin.Dialogs;
+using Conecto.Widgets;
 using Gee;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class Share : PluginInterface {
 
diff --git a/src/Conecto/Plugin/Telephony.vala b/src/Conecto/Plugin/Telephony.vala
index 3f8b2f57509ceda105d0959b9f03be1952b19d16..2edbaead008912aacf1eca51257e4f57823df2ed 100644
--- a/src/Conecto/Plugin/Telephony.vala
+++ b/src/Conecto/Plugin/Telephony.vala
@@ -16,13 +16,13 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using Gee;
-using EOSConnect;
-using EOSConnect.Widgets;
-using EOSConnect.Plugin;
-using EOSConnect.Plugin.Popover;
+using Conecto;
+using Conecto.Widgets;
+using Conecto.Plugin;
+using Conecto.Plugin.Popover;
 using MConnect;
 
-namespace EOSConnect.Plugin {
+namespace Conecto.Plugin {
 
     public class Telephony : PluginInterface {
 
diff --git a/src/Conecto/Plugin/Views/SMSMessagesView.vala b/src/Conecto/Plugin/Views/SMSMessagesView.vala
index af941a19a2501a75420518f35ee34dafb9d291d8..78e8233711215a6bc73153a40f2cdaaba0c1b41f 100644
--- a/src/Conecto/Plugin/Views/SMSMessagesView.vala
+++ b/src/Conecto/Plugin/Views/SMSMessagesView.vala
@@ -15,13 +15,13 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
-using EOSConnect.Plugin;
-using EOSConnect.Plugin.Widgets;
+using Conecto;
+using Conecto.Plugin;
+using Conecto.Plugin.Widgets;
 using Gee;
 using MConnect;
 
-namespace EOSConnect.Plugin.Views {
+namespace Conecto.Plugin.Views {
 
     public class SMSMessagesView : Gtk.Grid {
 
@@ -173,7 +173,7 @@ namespace EOSConnect.Plugin.Views {
             SMS sms = new SMS (
                 message,
                 SMS.FROM_ME,
-                SMS.FROM_TYPE_EOSCONNECT,
+                SMS.FROM_TYPE_CONECTO,
                 new DateTime.now_utc ());
 
             if (device.has_capability_handler (TelephonyHandler.TELEPHONY) ) {
diff --git a/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala
index 6b1e67612f0302d5f072f1018d240125ec97d4fa..9632ba8ab7bedb7f86b1a9ebacfe54dc6f06442d 100644
--- a/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala
+++ b/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
- using EOSConnect.Widgets;
+ using Conecto.Widgets;
  using MConnect;
 
-namespace EOSConnect.Plugin.Widgets {
+namespace Conecto.Plugin.Widgets {
 
      public class BatteryPluginListBoxRow : PluginListBoxRow {
 
diff --git a/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala
index 768a3ca113e4f2fe5813935f3fd9293b4bb93322..b04ef11246689186206da119ca0af2506433b159 100644
--- a/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala
+++ b/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Widgets;
+using Conecto.Widgets;
 using MConnect;
 
-namespace EOSConnect.Plugin.Widgets {
+namespace Conecto.Plugin.Widgets {
     
     public class PingPluginListBoxRow : PluginListBoxRow {
 
diff --git a/src/Conecto/Plugin/Widgets/SMSContactListBox.vala b/src/Conecto/Plugin/Widgets/SMSContactListBox.vala
index 80d735d9f411478b4730fe7728239c1c374c5bbe..5613d9e4fd149be2a6c6f0ace2dcfce06bdc458e 100644
--- a/src/Conecto/Plugin/Widgets/SMSContactListBox.vala
+++ b/src/Conecto/Plugin/Widgets/SMSContactListBox.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 using MConnect;
 
-namespace EOSConnect.Plugin.Widgets {
+namespace Conecto.Plugin.Widgets {
 
     public class SMSContactListBox : Gtk.ListBox {
 
diff --git a/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala b/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala
index 2f242fa395b0e1704f12f7db1fe528b4e71c4c0e..7aab8d4444cf335a56fd09d465be87f797db01e1 100644
--- a/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala
+++ b/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala
@@ -15,11 +15,11 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
-using EOSConnect.Plugin;
+using Conecto;
+using Conecto.Plugin;
 using MConnect;
 
-namespace EOSConnect.Plugin.Widgets {
+namespace Conecto.Plugin.Widgets {
 
     public class SMSContactListBoxRow : Gtk.ListBoxRow {
 
diff --git a/src/Conecto/Plugin/Widgets/SMSTextEntry.vala b/src/Conecto/Plugin/Widgets/SMSTextEntry.vala
index 6f32d9a4fa6a9bddd73f6aadf0b051bf3e0ff8df..fe5d934439b8fc5f1239041986a788d221b9fdb3 100644
--- a/src/Conecto/Plugin/Widgets/SMSTextEntry.vala
+++ b/src/Conecto/Plugin/Widgets/SMSTextEntry.vala
@@ -16,12 +16,12 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 
- using EOSConnect;
- using EOSConnect.Plugin;
+ using Conecto;
+ using Conecto.Plugin;
  using Gee;
  using MConnect;
 
- namespace EOSConnect.Plugin.Widgets {
+ namespace Conecto.Plugin.Widgets {
 
      public class SMSTextEntry : Gtk.Box {
 
diff --git a/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala
index b8c00188542d30c9d5ccaacdbcc3067cdd0acd97..b5911a08f584288fbab781a265023bb948bc39df 100644
--- a/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala
+++ b/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
- using EOSConnect.Widgets;
+ using Conecto.Widgets;
  using MConnect;
 
-namespace EOSConnect.Plugin.Widgets {
+namespace Conecto.Plugin.Widgets {
 
     public class TelephonyPluginListBoxRow : PluginListBoxRow {
 
diff --git a/src/Conecto/Plugin/Windows/SMSHistory.vala b/src/Conecto/Plugin/Windows/SMSHistory.vala
index cd14eb71a73252dee9d213c2046b9e38958d1700..69129eee3a854a9c7269dc9d09c06f314b35930c 100644
--- a/src/Conecto/Plugin/Windows/SMSHistory.vala
+++ b/src/Conecto/Plugin/Windows/SMSHistory.vala
@@ -16,12 +16,12 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using Gee;
-using EOSConnect;
-using EOSConnect.Plugin;
-using EOSConnect.Plugin.Views;
+using Conecto;
+using Conecto.Plugin;
+using Conecto.Plugin.Views;
 using MConnect;
 
-namespace EOSConnect.Plugin.Windows {
+namespace Conecto.Plugin.Windows {
 
     public class SMSHistory : Gtk.Stack {
 
diff --git a/src/Conecto/Tools.vala b/src/Conecto/Tools.vala
index 4ec1961db9c1501fdf1bcd976508693951db00ee..90670fb9a5a4ce0a84d3592e327d3cffba7b449f 100644
--- a/src/Conecto/Tools.vala
+++ b/src/Conecto/Tools.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect {
+namespace Conecto {
 
     public class Tools {
 
diff --git a/src/Conecto/Views/DeviceSettingsView.vala b/src/Conecto/Views/DeviceSettingsView.vala
index 416f7cb0dd2789a4996f082ef2e94664de5168bc..e92c7d94e25b1d3507ffddaf4f4305c9d01d7c99 100644
--- a/src/Conecto/Views/DeviceSettingsView.vala
+++ b/src/Conecto/Views/DeviceSettingsView.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect.Views {
+namespace Conecto.Views {
 
     public class DeviceSettingsView : Granite.SimpleSettingsPage {
 
diff --git a/src/Conecto/Views/DevicesView.vala b/src/Conecto/Views/DevicesView.vala
index 0e6ddbcff706d12bdf4491f648fb9253f5e42254..bf0da4afb2b1f3a223e5dcf8270c88917df7cf35 100644
--- a/src/Conecto/Views/DevicesView.vala
+++ b/src/Conecto/Views/DevicesView.vala
@@ -19,7 +19,7 @@ using Gee;
 using Granite.Widgets;
 using MConnect;
 
-namespace EOSConnect.Views {
+namespace Conecto.Views {
 
     public class DevicesView : Gtk.Frame {
 
diff --git a/src/Conecto/Views/MainSettingsView.vala b/src/Conecto/Views/MainSettingsView.vala
index 1a58b291031c5eb8f2dccbd9ddef275c84471e15..9a65ef4d2e9d63137afbce1e714a2fd771b5d6c1 100644
--- a/src/Conecto/Views/MainSettingsView.vala
+++ b/src/Conecto/Views/MainSettingsView.vala
@@ -15,7 +15,7 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-namespace EOSConnect.Views {
+namespace Conecto.Views {
 
     public class MainSettingsView : Gtk.Stack {
 
diff --git a/src/Conecto/Widgets/DeviceListActionBarFooter.vala b/src/Conecto/Widgets/DeviceListActionBarFooter.vala
index 5674b2cd37ed7bd117bba6a085fc31a34083cbd1..260c3bf4eb7db9d463731a1f28d1e54924e98800 100644
--- a/src/Conecto/Widgets/DeviceListActionBarFooter.vala
+++ b/src/Conecto/Widgets/DeviceListActionBarFooter.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect.Widgets {
+namespace Conecto.Widgets {
 
     public class DeviceListActionBarFooter : Gtk.ActionBar {
 
diff --git a/src/Conecto/Widgets/DeviceListBox.vala b/src/Conecto/Widgets/DeviceListBox.vala
index 541dd90b30c55572b965d131a37dabace5259e9e..a461cf7f8c397d904be85857ba636240e6628115 100644
--- a/src/Conecto/Widgets/DeviceListBox.vala
+++ b/src/Conecto/Widgets/DeviceListBox.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect.Widgets {
+namespace Conecto.Widgets {
 
     public class DeviceListBox : Gtk.ListBox {
 
diff --git a/src/Conecto/Widgets/DeviceListBoxRow.vala b/src/Conecto/Widgets/DeviceListBoxRow.vala
index 3a675b3578b422fa82d864144e6507b89e14219f..3006cd8ee5444d3bc2e5dafc6745c9b4812c6d9d 100644
--- a/src/Conecto/Widgets/DeviceListBoxRow.vala
+++ b/src/Conecto/Widgets/DeviceListBoxRow.vala
@@ -17,7 +17,7 @@
  */
 using MConnect;
 
-namespace EOSConnect.Widgets {
+namespace Conecto.Widgets {
 
     public class DeviceListBoxRow : Gtk.ListBoxRow {
 
diff --git a/src/Conecto/Widgets/DeviceMenuitem.vala b/src/Conecto/Widgets/DeviceMenuitem.vala
index dc181e8b9b07724c726818a5d4619953785543e0..75e95d5c6fabe8744a4705a3a13d56e8d4bd76db 100644
--- a/src/Conecto/Widgets/DeviceMenuitem.vala
+++ b/src/Conecto/Widgets/DeviceMenuitem.vala
@@ -16,10 +16,10 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using MConnect;
-using EOSConnect.Plugin;
-using EOSConnect.Plugin.Windows;
+using Conecto.Plugin;
+using Conecto.Plugin.Windows;
 
-namespace EOSConnect.Widgets {
+namespace Conecto.Widgets {
 
     public class DeviceMenuitem : Dbusmenu.Menuitem {
 
@@ -105,7 +105,7 @@ namespace EOSConnect.Widgets {
                         ((Share)device.get_plugin (ShareHandler.SHARE_PKT)).select_files (device);
                     });
                     child_append (sub_menu_item_share);
-                    EOSConnect.Contractor.create_contract (device);
+                    Conecto.Contractor.create_contract (device);
                 }
 
                 sub_menu_item_share.property_set (Dbusmenu.MENUITEM_PROP_ICON_NAME, "send-to");
@@ -114,7 +114,7 @@ namespace EOSConnect.Widgets {
                 if (sub_menu_item_share != null) {
                     child_delete (sub_menu_item_share);
                     sub_menu_item_share = null;
-                    EOSConnect.Contractor.destroy_contract (device);
+                    Conecto.Contractor.destroy_contract (device);
                 }
             }
         }
diff --git a/src/Conecto/Widgets/PluginListBox.vala b/src/Conecto/Widgets/PluginListBox.vala
index 59ee8e65825d4dc612a6d2ce1aa96cccfdcc1f1b..94e61bcc2da97960d7bb7e4a053a72010c907d1a 100644
--- a/src/Conecto/Widgets/PluginListBox.vala
+++ b/src/Conecto/Widgets/PluginListBox.vala
@@ -16,9 +16,9 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using MConnect;
-using EOSConnect.Plugin;
+using Conecto.Plugin;
 
-namespace EOSConnect.Widgets {
+namespace Conecto.Widgets {
 
     public class PluginListBox : Gtk.ListBox {
 
diff --git a/src/Conecto/Widgets/PluginListBoxRow.vala b/src/Conecto/Widgets/PluginListBoxRow.vala
index b58319e8cf84823c5cd6bca32a1c775d22c278be..0b778bf0f10175c81cbad588ef34399edd7bb537 100644
--- a/src/Conecto/Widgets/PluginListBoxRow.vala
+++ b/src/Conecto/Widgets/PluginListBoxRow.vala
@@ -15,10 +15,10 @@
  * AUTHORS
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect.Plugin;
+using Conecto.Plugin;
 using MConnect;
 
-namespace EOSConnect.Widgets {
+namespace Conecto.Widgets {
     public class PluginListBoxRow : Gtk.ListBoxRow {
 
         public weak PluginInterface plugin_interface { get; construct; }
diff --git a/src/MConnect/BatteryHandler.vala b/src/MConnect/BatteryHandler.vala
index 9fc8a39e11da88c8e9ffb961d325807aedd5f806..d4f0b36a6872dffe30198cb1712609953959ce7a 100644
--- a/src/MConnect/BatteryHandler.vala
+++ b/src/MConnect/BatteryHandler.vala
@@ -16,7 +16,7 @@
  * Maciek Borzecki <maciek.borzecki (at] gmail.com>
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
+using Conecto;
 
 namespace MConnect {
 
diff --git a/src/MConnect/Device.vala b/src/MConnect/Device.vala
index b9af4e5c08df88861b1501871fd48d5c2fea1358..82c401f8081498249f9b9e152ef56b4e2da8f9d0 100644
--- a/src/MConnect/Device.vala
+++ b/src/MConnect/Device.vala
@@ -17,8 +17,8 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using Gee;
-using EOSConnect;
-using EOSConnect.Plugin;
+using Conecto;
+using Conecto.Plugin;
 
 namespace MConnect {
 
@@ -397,13 +397,13 @@ namespace MConnect {
 
         public void setup_plugins () {
             var schema = SettingsSchemaSource.get_default ().lookup (
-                EOSConnect.App.GSETTINGS_SCHEMA_ID + ".settings.device",
+                Conecto.App.GSETTINGS_SCHEMA_ID + ".settings.device",
                 false);
             if (schema != null) {
                 debug ("Getting config for device ID: " + id);
                 settings = new GLib.Settings.full (schema,
                     null,
-                    EOSConnect.App.GSETTINGS_SCHEMA_PATH + "/settings/devices/%s/".printf (id));
+                    Conecto.App.GSETTINGS_SCHEMA_PATH + "/settings/devices/%s/".printf (id));
 
                 if (settings.get_string ("custom-name").length > 1) {
                     custom_name =  settings.get_string ("custom-name");
diff --git a/src/MConnect/DeviceManager.vala b/src/MConnect/DeviceManager.vala
index 7de7246c88e5c4f5960e9b0ed97281137ef93163..78912cf7a678bf1ebad2545ae9682de7eb57a130 100644
--- a/src/MConnect/DeviceManager.vala
+++ b/src/MConnect/DeviceManager.vala
@@ -17,7 +17,7 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using Gee;
-using EOSConnect;
+using Conecto;
 
 namespace MConnect {
 
diff --git a/src/MConnect/DownloadTransfer.vala b/src/MConnect/DownloadTransfer.vala
index 30bd5acd8bc0d4a9edf64918f25e7aa08ebf91cd..5ac44387bdc73d828613025a223d49acd2fc4f2e 100644
--- a/src/MConnect/DownloadTransfer.vala
+++ b/src/MConnect/DownloadTransfer.vala
@@ -35,7 +35,7 @@ namespace MConnect {
         public string destination = "";
 
         public DownloadTransfer (Device device, InetSocketAddress isa, uint64 size, string destination) {
-            this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (EOSConnect.App.GSETTINGS_SCHEMA_ID + ".desktop");
+            this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (Conecto.App.GSETTINGS_SCHEMA_ID + ".desktop");
             this.isa = isa;
             this.cancellable = new Cancellable ();
             this.destination = destination;
diff --git a/src/MConnect/NotificationHandler.vala b/src/MConnect/NotificationHandler.vala
index 4937abc966d9c5b254d848df3a416d2caec96266..f73483ec94891568b17b7d67a012374420ea41e7 100644
--- a/src/MConnect/NotificationHandler.vala
+++ b/src/MConnect/NotificationHandler.vala
@@ -17,7 +17,7 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 using Gee;
-using EOSConnect;
+using Conecto;
 
 namespace MConnect {
 
diff --git a/src/MConnect/ShareHandler.vala b/src/MConnect/ShareHandler.vala
index 128261c269229b93d7d5b3921be732c9e27973bd..373be75a895f044117660fa18bc747247b76d188 100644
--- a/src/MConnect/ShareHandler.vala
+++ b/src/MConnect/ShareHandler.vala
@@ -37,7 +37,7 @@ namespace MConnect {
             if (ShareHandler.DOWNLOADS == null) {
 
                 ShareHandler.DOWNLOADS = Path.build_filename (
-                    Environment.get_user_special_dir (UserDirectory.DOWNLOAD), "EOSConnect");
+                    Environment.get_user_special_dir (UserDirectory.DOWNLOAD), "Conecto");
 
                 if (DirUtils.create_with_parents (ShareHandler.DOWNLOADS, 0700) == -1) {
                     warning ("Failed to create downloads directory: %s", Posix.strerror (Posix.errno));
diff --git a/src/MConnect/ShareHandlerProxy.vala b/src/MConnect/ShareHandlerProxy.vala
index 041839d38c4e892701a714372d59f744f9cdc898..a95e86062fbbef88eff2e8c5f01eec814cd0389c 100644
--- a/src/MConnect/ShareHandlerProxy.vala
+++ b/src/MConnect/ShareHandlerProxy.vala
@@ -16,7 +16,7 @@
  * gyan000 <gyan000 (at] ijaz.fr>
  */
 
-using EOSConnect.Plugin;
+using Conecto.Plugin;
 using Gee;
 using MConnect;
 
diff --git a/src/MConnect/TelephonyHandler.vala b/src/MConnect/TelephonyHandler.vala
index 5b248df9d08954610106b740966d36b211664f20..3800e81c0363f2db00a19365077fa2c24d6cd6f2 100644
--- a/src/MConnect/TelephonyHandler.vala
+++ b/src/MConnect/TelephonyHandler.vala
@@ -16,8 +16,8 @@
  * Maciek Borzecki <maciek.borzecki (at] gmail.com>
  * gyan000 <gyan000 (at] ijaz.fr>
  */
-using EOSConnect;
-using EOSConnect.Plugin;
+using Conecto;
+using Conecto.Plugin;
 
 namespace MConnect {
 
@@ -108,7 +108,7 @@ namespace MConnect {
             notification.set_body (notif_body);
 
             if (event == "sms") {
-                // Action defined in EOSConnect._init_sms_history_view ()
+                // Action defined in Conecto._init_sms_history_view ()
                 notification.set_default_action ("app.telephony-open-sms-tab");
             }
 
diff --git a/src/MConnect/UploadTransfer.vala b/src/MConnect/UploadTransfer.vala
index a5d51f4c55a1d400c79c0eeab9ba961a707b1925..2fe9b19377bea114d76e786ad805632ed7c12cef 100644
--- a/src/MConnect/UploadTransfer.vala
+++ b/src/MConnect/UploadTransfer.vala
@@ -43,7 +43,7 @@ namespace MConnect {
             int file_num = 1,
             string file_uri = ""
         ) {
-            this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (EOSConnect.App.GSETTINGS_SCHEMA_ID + ".desktop");
+            this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (Conecto.App.GSETTINGS_SCHEMA_ID + ".desktop");
             this.socket_service = socket_service;
             this.cancellable = new Cancellable ();
             this.device = device;