From 3570068c52397967c1cace13954eb43ec01ab26b Mon Sep 17 00:00:00 2001
From: Hannes Schulze <haschu0103@gmail.com>
Date: Sun, 27 Jan 2019 15:25:38 +0100
Subject: [PATCH] Change names in Namespaces

---
 po/POTFILES                                            |  2 +-
 src/Conecto/Conecto.vala                               |  8 ++++----
 src/Conecto/Config.vala                                |  2 +-
 src/Conecto/Contact.vala                               |  2 +-
 src/Conecto/ContactsInterface.vala                     |  2 +-
 src/Conecto/Contractor.vala                            |  6 +++---
 src/Conecto/DebugToolbar.vala                          |  2 +-
 src/Conecto/EContacts.vala                             |  2 +-
 src/Conecto/MainWindow.vala                            |  8 ++++----
 src/Conecto/Notification.vala                          |  2 +-
 src/Conecto/Plugin/Battery.vala                        |  6 +++---
 src/Conecto/Plugin/Dialogs/NotificationSettings.vala   |  4 ++--
 src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala  |  4 ++--
 src/Conecto/Plugin/Notification.vala                   |  4 ++--
 src/Conecto/Plugin/Ping.vala                           |  6 +++---
 src/Conecto/Plugin/PluginInterface.vala                |  4 ++--
 src/Conecto/Plugin/Popover/BatterySettings.vala        |  4 ++--
 .../Plugin/Popover/SMSNewMessageNewContact.vala        |  8 ++++----
 src/Conecto/Plugin/Popover/ShareSettings.vala          |  4 ++--
 src/Conecto/Plugin/Popover/TelephonySettings.vala      |  4 ++--
 src/Conecto/Plugin/SMS.vala                            |  4 ++--
 src/Conecto/Plugin/SMSContact.vala                     |  2 +-
 src/Conecto/Plugin/SMSStore.vala                       |  2 +-
 src/Conecto/Plugin/SMSStoreFactory.vala                |  2 +-
 src/Conecto/Plugin/SMSStoreInterface.vala              |  2 +-
 src/Conecto/Plugin/SMSStoreSQLite.vala                 |  2 +-
 src/Conecto/Plugin/SMSStoreTemp.vala                   |  2 +-
 src/Conecto/Plugin/Share.vala                          |  8 ++++----
 src/Conecto/Plugin/Telephony.vala                      | 10 +++++-----
 src/Conecto/Plugin/Views/SMSMessagesView.vala          | 10 +++++-----
 .../Plugin/Widgets/BatteryPluginListBoxRow.vala        |  4 ++--
 src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala   |  4 ++--
 src/Conecto/Plugin/Widgets/SMSContactListBox.vala      |  4 ++--
 src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala   |  6 +++---
 src/Conecto/Plugin/Widgets/SMSTextEntry.vala           |  6 +++---
 .../Plugin/Widgets/TelephonyPluginListBoxRow.vala      |  4 ++--
 src/Conecto/Plugin/Windows/SMSHistory.vala             |  8 ++++----
 src/Conecto/Tools.vala                                 |  2 +-
 src/Conecto/Views/DeviceSettingsView.vala              |  2 +-
 src/Conecto/Views/DevicesView.vala                     |  2 +-
 src/Conecto/Views/MainSettingsView.vala                |  2 +-
 src/Conecto/Widgets/DeviceListActionBarFooter.vala     |  2 +-
 src/Conecto/Widgets/DeviceListBox.vala                 |  2 +-
 src/Conecto/Widgets/DeviceListBoxRow.vala              |  2 +-
 src/Conecto/Widgets/DeviceMenuitem.vala                | 10 +++++-----
 src/Conecto/Widgets/PluginListBox.vala                 |  4 ++--
 src/Conecto/Widgets/PluginListBoxRow.vala              |  4 ++--
 src/MConnect/BatteryHandler.vala                       |  2 +-
 src/MConnect/Device.vala                               |  8 ++++----
 src/MConnect/DeviceManager.vala                        |  2 +-
 src/MConnect/DownloadTransfer.vala                     |  2 +-
 src/MConnect/NotificationHandler.vala                  |  2 +-
 src/MConnect/ShareHandler.vala                         |  2 +-
 src/MConnect/ShareHandlerProxy.vala                    |  2 +-
 src/MConnect/TelephonyHandler.vala                     |  6 +++---
 src/MConnect/UploadTransfer.vala                       |  2 +-
 56 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/po/POTFILES b/po/POTFILES
index ba129c6..1a2ccc8 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 a31e2f5..bddea48 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 434c8f1..3edf642 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 4623a7a..763e540 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 5334146..002fa47 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 b8bd223..d1d0cff 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 ae7760e..670a87d 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 05ab3e9..176f263 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 2f9723a..039d1f2 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 2866fb1..0e7fe4a 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 92bf49d..9c97f52 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 c63d427..484776e 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 a642b3c..173fd74 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 a84f73a..8351b4b 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 1d756db..33c7460 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 12c2ad0..f5f5d54 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 a21187f..a5eda84 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 6bb0f28..506fb38 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 d9615ff..c69e881 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 a03256f..f28e97d 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 26509c7..234e4f5 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 3978bc8..32da043 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 6d17787..8dbe5a8 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 03e8b47..ce2e244 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 4c8d72a..a90eb0c 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 de164c5..e41416f 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 f4575fe..a224c05 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 98a8135..210805c 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 3f8b2f5..2edbaea 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 af941a1..78e8233 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 6b1e676..9632ba8 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 768a3ca..b04ef11 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 80d735d..5613d9e 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 2f242fa..7aab8d4 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 6f32d9a..fe5d934 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 b8c0018..b5911a0 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 cd14eb7..69129ee 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 4ec1961..90670fb 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 416f7cb..e92c7d9 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 0e6ddbc..bf0da4a 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 1a58b29..9a65ef4 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 5674b2c..260c3bf 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 541dd90..a461cf7 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 3a675b3..3006cd8 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 dc181e8..75e95d5 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 59ee8e6..94e61bc 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 b58319e..0b778bf 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 9fc8a39..d4f0b36 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 b9af4e5..82c401f 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 7de7246..78912cf 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 30bd5ac..5ac4438 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 4937abc..f73483e 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 128261c..373be75 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 041839d..a95e860 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 5b248df..3800e81 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 a5d51f4..2fe9b19 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;
-- 
GitLab