ecordova: Removed constructors

72 files changed, 415 insertions, 1078 deletions

diff --git a/src/Makefile_Ecordova.am b/src/Makefile_Ecordova.am
index 1f82cd4d19..342b4c4105 100644
--- a/src/Makefile_Ecordova.am
+++ b/src/Makefile_Ecordova.am
@@ -14,12 +14,10 @@ lib/ecordova/ecordova_contactorganization.eo \
 lib/ecordova/ecordova_device.eo \
 lib/ecordova/ecordova_devicemotion.eo \
 lib/ecordova/ecordova_deviceorientation.eo \
-lib/ecordova/ecordova_dialogs.eo \
 lib/ecordova/ecordova_geolocation.eo \
 lib/ecordova/ecordova_globalization.eo \
 lib/ecordova/ecordova_media.eo \
 lib/ecordova/ecordova_networkinformation.eo \
-lib/ecordova/ecordova_splashscreen.eo \
 lib/ecordova/ecordova_vibration.eo \
 lib/ecordova/ecordova_file.eo \
 lib/ecordova/ecordova_filewriter.eo \
diff --git a/src/lib/ecordova/Ecordova_Eo.h b/src/lib/ecordova/Ecordova_Eo.h
index 3cbd474f72..7a0dd2ee17 100644
--- a/src/lib/ecordova/Ecordova_Eo.h
+++ b/src/lib/ecordova/Ecordova_Eo.h
@@ -13,12 +13,10 @@ typedef Eo Ecordova_DirectoryReader;
 #include <ecordova_device.eo.h>
 #include <ecordova_devicemotion.eo.h>
 #include <ecordova_deviceorientation.eo.h>
-#include <ecordova_dialogs.eo.h>
 #include <ecordova_geolocation.eo.h>
 #include <ecordova_globalization.eo.h>
 #include <ecordova_media.eo.h>
 #include <ecordova_networkinformation.eo.h>
-#include <ecordova_splashscreen.eo.h>
 #include <ecordova_vibration.eo.h>
 #include <ecordova_file.eo.h>
 #include <ecordova_filewriter.eo.h>
diff --git a/src/lib/ecordova/ecordova_batterystatus.eo b/src/lib/ecordova/ecordova_batterystatus.eo
index 2dcb511c73..b05843d74b 100644
--- a/src/lib/ecordova/ecordova_batterystatus.eo
+++ b/src/lib/ecordova/ecordova_batterystatus.eo
@@ -16,22 +16,10 @@ class Ecordova.BatteryStatus (Eo.Base) {
       http://plugins.cordova.io/#/package/org.apache.cordova.battery-status
     ]]
     legacy_prefix: null;
-    methods {
-        constructor {
-            [[Custom Ecordova_BatteryStatus constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
-    }
     implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         battery,status: const(Ecordova.BatteryStatus.EventInfo)*;
         [[This event fires when the percentage of battery charge changes by at
diff --git a/src/lib/ecordova/ecordova_console.eo b/src/lib/ecordova/ecordova_console.eo
index 208f3f961c..d8283caada 100644
--- a/src/lib/ecordova/ecordova_console.eo
+++ b/src/lib/ecordova/ecordova_console.eo
@@ -15,13 +15,6 @@ class Ecordova.Console (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Console constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         log {
             [[Logs a message at the LOG level.]]
             params {
@@ -100,7 +93,4 @@ class Ecordova.Console (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/lib/ecordova/ecordova_contactaddress.eo b/src/lib/ecordova/ecordova_contactaddress.eo
index ee5a9efef9..6c20c5f0c1 100644
--- a/src/lib/ecordova/ecordova_contactaddress.eo
+++ b/src/lib/ecordova/ecordova_contactaddress.eo
@@ -2,40 +2,6 @@ class Ecordova.ContactAddress (Eo.Base) {
     [[Contains information about a single contact.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_ContactAddress constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                pref: bool;
-                [[user's preferred value.]]
-
-                type: const(char)*;
-                [[A string indicating what type of field this is, home for
-                  example.
-                ]]
-
-                formatted: const(char)*;
-                [[The full address formatted for display.]]
-
-                street_address: const(char)*;
-                [[The full street address.]]
-
-                locality: const(char)*;
-                [[The city or locality.]]
-
-                region: const(char)*;
-                [[The state or region.]]
-
-                postal_code: const(char)*;
-                [[The zip code or postal code.]]
-
-                country: const(char)*;
-                [[The country name.]]
-            }
-        }
         @property id {
             get {}
             values {
@@ -87,7 +53,4 @@ class Ecordova.ContactAddress (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/lib/ecordova/ecordova_contactfield.eo b/src/lib/ecordova/ecordova_contactfield.eo
index b61930547f..20c221839a 100644
--- a/src/lib/ecordova/ecordova_contactfield.eo
+++ b/src/lib/ecordova/ecordova_contactfield.eo
@@ -2,29 +2,6 @@ class Ecordova.ContactField (Eo.Base) {
     [[Contains information about a single contact.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_ContactField constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                type: const(char)*;
-                [[A string that indicates what type of field this is, home for
-                  example.
-                ]]
-
-                value: const(char)*;
-                [[The value of the field, such as a phone number or email
-                  address.
-                ]]
-
-                pref: bool;
-                [[Set to true if this ContactField contains the user's preferred
-                  value.
-                ]]
-            }
-        }
         @property id {
             get {}
             values {
@@ -51,7 +28,4 @@ class Ecordova.ContactField (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/lib/ecordova/ecordova_contactname.eo b/src/lib/ecordova/ecordova_contactname.eo
index 435d714dbb..0472d7a549 100644
--- a/src/lib/ecordova/ecordova_contactname.eo
+++ b/src/lib/ecordova/ecordova_contactname.eo
@@ -2,21 +2,6 @@ class Ecordova.ContactName (Eo.Base) {
     [[Contact name.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_ContactName constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                formatted: const(char)*; [[The complete name of the contact.]]
-                family_name: const(char)*; [[The contact's family name.]]
-                given_name: const(char)*; [[The contact's given name.]]
-                middle: const(char)*; [[The contact's middle name.]]
-                prefix: const(char)*; [[The contact's prefix (example Mr. or Dr.)]]
-                suffix: const(char)*; [[The contact's suffix (example Esq.).]]
-            }
-        }
         @property formatted {
             values {
                 formatted: const(char)*;
@@ -52,7 +37,4 @@ class Ecordova.ContactName (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/lib/ecordova/ecordova_contactorganization.eo b/src/lib/ecordova/ecordova_contactorganization.eo
index baf6b275cd..c0b18ac2bd 100644
--- a/src/lib/ecordova/ecordova_contactorganization.eo
+++ b/src/lib/ecordova/ecordova_contactorganization.eo
@@ -2,34 +2,6 @@ class Ecordova.ContactOrganization (Eo.Base) {
     [[Contact name.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_ContactOrganization constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                pref: bool;
-                [[Set to true if this ContactOrganization contains the user's
-                  preferred value.
-                ]]
-
-                type: const(char)*;
-                [[A string that indicates what type of field this is, home for
-                  example.
-                ]]
-
-                name: const(char)*;
-                [[The name of the organization.]]
-
-                dept: const(char)*;
-                [[The department the contract works for.]]
-
-                title: const(char)*;
-                [[The contact's title at the organization.]]
-
-            }
-        }
         @property id {
             get {}
             values {
@@ -66,7 +38,4 @@ class Ecordova.ContactOrganization (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/lib/ecordova/ecordova_contacts.eo b/src/lib/ecordova/ecordova_contacts.eo
index 0c968006ab..1c266a513f 100644
--- a/src/lib/ecordova/ecordova_contacts.eo
+++ b/src/lib/ecordova/ecordova_contacts.eo
@@ -28,13 +28,6 @@ class Ecordova.Contacts (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Contacts constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         find {
             [[Returns an array of Contacts matching the search criteria.]]
             params {
@@ -65,9 +58,6 @@ class Ecordova.Contacts (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         find,success: const(array<Ecordova.Contact*>)*;
         pick,success: const(array<Ecordova.Contact*>)*;
diff --git a/src/lib/ecordova/ecordova_device.eo b/src/lib/ecordova/ecordova_device.eo
index 8221850c97..2d1d429f8b 100644
--- a/src/lib/ecordova/ecordova_device.eo
+++ b/src/lib/ecordova/ecordova_device.eo
@@ -5,13 +5,6 @@ class Ecordova.Device (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Device constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         @property ecordova {
             [[Get the version of Ecordova running on the device.]]
             get {}
@@ -54,7 +47,4 @@ class Ecordova.Device (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/lib/ecordova/ecordova_devicemotion.eo b/src/lib/ecordova/ecordova_devicemotion.eo
index 20640d3351..c344815349 100644
--- a/src/lib/ecordova/ecordova_devicemotion.eo
+++ b/src/lib/ecordova/ecordova_devicemotion.eo
@@ -20,15 +20,6 @@ class Ecordova.DeviceMotion (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_DeviceMotion constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-            }
-        }
         current_acceleration_get {
             [[Get the current acceleration]]
         }
@@ -59,9 +50,6 @@ class Ecordova.DeviceMotion (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         current,success: Ecordova.DeviceMotion.Acceleration*;
         watch,success: Ecordova.DeviceMotion.Acceleration*;
diff --git a/src/lib/ecordova/ecordova_deviceorientation.eo b/src/lib/ecordova/ecordova_deviceorientation.eo
index edf3b4a6c2..dffcfeb76a 100644
--- a/src/lib/ecordova/ecordova_deviceorientation.eo
+++ b/src/lib/ecordova/ecordova_deviceorientation.eo
@@ -37,13 +37,6 @@ class Ecordova.DeviceOrientation (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_DeviceOrientation constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         current_heading_get {
             [[Get the current compass heading. The compass heading is returned
               via a CompassHeading object using the compassSuccess callback
@@ -76,9 +69,6 @@ class Ecordova.DeviceOrientation (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         current,success: Ecordova.DeviceOrientation.Heading*;
         watch,success: Ecordova.DeviceOrientation.Heading*;
diff --git a/src/lib/ecordova/ecordova_dialogs.eo b/src/lib/ecordova/ecordova_dialogs.eo
deleted file mode 100644
index 4f51b20b46..0000000000
--- a/src/lib/ecordova/ecordova_dialogs.eo
+++ /dev/null
@@ -1,87 +0,0 @@
-struct Ecordova_Dialogs_PromptCallback {
-    button_index: int;
-    [[The index of the pressed button. (Number) Note that the index uses
-      one-based indexing, so the value is 1, 2, 3, etc.]]
-
-    input1: const(char)*;
-    [[The text entered in the prompt dialog box.]]
-}
-
-class Ecordova.Dialogs (Eo.Base) {
-    [[Ecordova Dialogs Plugin
-      Plugin ID: org.apache.cordova.dialogs
-      http://plugins.cordova.io/#/package/org.apache.cordova.dialogs
-    ]]
-    legacy_prefix: null;
-    methods {
-        constructor {
-            [[Custom Ecordova_Dialogs constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
-        alert {
-            params {
-                message: const(char)*;
-                [[Dialog message.]]
-
-                title: const(char)*;
-                [[Dialog title (Optional, defaults to 'Alert').]]
-
-                buttons: list<const(char)*>*;
-                [[Button names (Optional, defaults to OK)]]
-            }
-        }
-        confirm {
-            params {
-                message: const(char)*;
-                [[Dialog message.]]
-
-                title: const(char)*;
-                [[Dialog title (Optional, defaults to 'Confirm').]]
-
-                buttons: list<const(char)*>*;
-                [[Button names (Optional, defaults to [OK,Cancel])]]
-            }
-        }
-        prompt {
-            params {
-                message: const(char)*;
-                [[Dialog message.]]
-
-                title: const(char)*;
-                [[Dialog title (Optional, defaults to 'Prompt').]]
-
-                buttons: list<const(char)*>*;
-                [[Button names (Optional, defaults to [OK,Cancel])]]
-
-                default_text: const(char)*;
-                [[Default textbox input value (Optional, Default: empty string)]]
-            }
-        }
-        beep {
-            [[The device plays a beep sound.]]
-            params {
-                times: int; [[The number of times to repeat the beep.]]
-            }
-        }
-    }
-    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
-    }
-    constructors {
-        .constructor;
-    }
-    events {
-        alert;
-        [[Callback to invoke when alert dialog is dismissed.]]
-
-        confirm: int;
-        [[Callback to invoke with index of button pressed (1, 2, or 3) or when
-          the dialog is dismissed without a button press (0).]]
-
-        prompt: Ecordova_Dialogs_PromptCallback;
-    }
-}
diff --git a/src/lib/ecordova/ecordova_directoryentry.eo b/src/lib/ecordova/ecordova_directoryentry.eo
index d751d1d3a5..536d9715a3 100644
--- a/src/lib/ecordova/ecordova_directoryentry.eo
+++ b/src/lib/ecordova/ecordova_directoryentry.eo
@@ -7,27 +7,6 @@ class Ecordova.DirectoryEntry (Ecordova.Entry) {
     [[An interface representing a directory on the file system.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_DirectoryEntry constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                name: const(char)*;
-                [[name of the directory, excluding the path leading to it]]
-
-                path: const(char)*;
-                [[the absolute full path to the directory]]
-
-                file_system: Ecordova.FileSystem*;
-                [[filesystem on which the directory resides]]
-
-                url: const(char)*;
-                [[an alternate URL which can be used by native webview
-                  controls, for example media players.]]
-            }
-        }
         reader_create {
             [[Creates a new DirectoryReader to read entries from this directory]]
             return: own(Ecordova.DirectoryReader*);
@@ -64,9 +43,6 @@ class Ecordova.DirectoryEntry (Ecordova.Entry) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         directory,get: Ecordova.DirectoryEntry*;
         remove,success; [[called with no parameters]]
diff --git a/src/lib/ecordova/ecordova_directoryreader.eo b/src/lib/ecordova/ecordova_directoryreader.eo
index e8c6428136..dd66e16aa6 100644
--- a/src/lib/ecordova/ecordova_directoryreader.eo
+++ b/src/lib/ecordova/ecordova_directoryreader.eo
@@ -4,14 +4,13 @@ class Ecordova.DirectoryReader (Eo.Base) {
     [[An interface that lists the files and directories in a directory.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_DirectoryReader constructor.
-              @.constructor
+        @property native {
+            [[Custom Ecordova_DirectoryReader native property.
 
               @since 2.3
             ]]
-            params {
-                native: const(char)*;
+            values {
+                native: const(char)* @optional;
             }
         }
         entries_read {
@@ -23,7 +22,7 @@ class Ecordova.DirectoryReader (Eo.Base) {
         Eo.Base.destructor;
     }
     constructors {
-        .constructor;
+        .native;
     }
     events {
         success: const(list<Ecordova.Entry*>*); [[called with a list of entries]]
diff --git a/src/lib/ecordova/ecordova_entry.eo b/src/lib/ecordova/ecordova_entry.eo
index 044c9231a5..72d49d3efc 100644
--- a/src/lib/ecordova/ecordova_entry.eo
+++ b/src/lib/ecordova/ecordova_entry.eo
@@ -7,33 +7,6 @@ class Ecordova.Entry (Eo.Base) {
     [[Represents a file or directory on the local file system.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Entry constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                file_is: bool;
-                [[true if Entry is a file]]
-
-                directory_is: bool;
-                [[true if Entry is a directory]]
-
-                name: const(char)*;
-                [[name of the file or directory, excluding the path leading to it]]
-
-                path: const(char)*;
-                [[the absolute full path to the file or directory]]
-
-                file_system: Ecordova.FileSystem*;
-                [[the filesystem on which this entry resides]]
-
-                url: const(char)*;
-                [[an alternate URL which can be used by native webview controls,
-                  for example media players.]]
-            }
-        }
         metadata_get {
             [[Look up the metadata of the entry.]]
         }
@@ -72,7 +45,6 @@ class Ecordova.Entry (Eo.Base) {
             [[Look up the parent DirectoryEntry of this entry.]]
         }
         @property file_is {
-            get {}
             values {
                 value: bool;
             }
@@ -84,13 +56,11 @@ class Ecordova.Entry (Eo.Base) {
             }
         }
         @property name {
-            get {}
             values {
                 value: const(char)*;
             }
         }
         @property path {
-            get {}
             values {
                 value: const(char)*;
             }
@@ -100,9 +70,6 @@ class Ecordova.Entry (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         metadata,get: const(Ecordova_Metadata)*;
         error: Ecordova_FileError*;
diff --git a/src/lib/ecordova/ecordova_fileentry.eo b/src/lib/ecordova/ecordova_fileentry.eo
index c635c8e942..2df1d1d7b2 100644
--- a/src/lib/ecordova/ecordova_fileentry.eo
+++ b/src/lib/ecordova/ecordova_fileentry.eo
@@ -2,27 +2,6 @@ class Ecordova.FileEntry (Ecordova.Entry) {
     [[An interface representing a file on the file system.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_FileEntry constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                name: const(char)*;
-                [[name of the file, excluding the path leading to it]]
-
-                path: const(char)*;
-                [[the absolute full path to the file]]
-
-                file_system: Ecordova.FileSystem*;
-                [[filesystem on which the file resides]]
-
-                url: const(char)*;
-                [[an alternate URL which can be used by native webview
-                  controls, for example media players.]]
-            }
-        }
         writer_create {
             [[Creates a new FileWriter associated with the file that this
               FileEntry represents.]]
@@ -37,9 +16,6 @@ class Ecordova.FileEntry (Ecordova.Entry) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         create,writer: Ecordova.FileWriter*;
         file: Ecordova.File*;
diff --git a/src/lib/ecordova/ecordova_filereader.eo b/src/lib/ecordova/ecordova_filereader.eo
index 4dcdd7a759..6d04593edd 100644
--- a/src/lib/ecordova/ecordova_filereader.eo
+++ b/src/lib/ecordova/ecordova_filereader.eo
@@ -19,13 +19,6 @@ class Ecordova.FileReader (Eo.Base) {
     [[This class reads the device file system.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_FileReader constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         abort {
             [[Abort reading file.]]
         }
@@ -65,9 +58,6 @@ class Ecordova.FileReader (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         on,load,start: const(Ecordova_ProgressEvent)*;
         [[When read starts]]
diff --git a/src/lib/ecordova/ecordova_filetransfer.eo b/src/lib/ecordova/ecordova_filetransfer.eo
index 19faa3d298..7bec2800eb 100644
--- a/src/lib/ecordova/ecordova_filetransfer.eo
+++ b/src/lib/ecordova/ecordova_filetransfer.eo
@@ -74,13 +74,6 @@ class Ecordova.FileTransfer (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_FileTransfer constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         upload {
             [[sends a file to a server.]]
             params {
@@ -134,9 +127,6 @@ class Ecordova.FileTransfer (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         upload,success: const(Ecordova_FileTransfer_UploadResult)*;
         [[A callback that is passed a FileUploadResult object.]]
diff --git a/src/lib/ecordova/ecordova_filewriter.eo b/src/lib/ecordova/ecordova_filewriter.eo
index 6a3f9a1a5c..c4dac2b578 100644
--- a/src/lib/ecordova/ecordova_filewriter.eo
+++ b/src/lib/ecordova/ecordova_filewriter.eo
@@ -23,9 +23,9 @@ class Ecordova.FileWriter (Eo.Base) {
     [[This class writes to the device file system.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_FileWriter constructor.
-              @.constructor
+        file_set {
+            [[Custom Ecordova_FileWriter file_set.
+              @.file_set
 
               @since 2.3
             ]]
@@ -87,7 +87,7 @@ class Ecordova.FileWriter (Eo.Base) {
         Eo.Base.destructor;
     }
     constructors {
-        .constructor;
+        .file_set;
     }
     events {
         on,write,start: const(ProgressEvent)*;
diff --git a/src/lib/ecordova/ecordova_geolocation.eo b/src/lib/ecordova/ecordova_geolocation.eo
index 1339149d60..c50658f9bb 100644
--- a/src/lib/ecordova/ecordova_geolocation.eo
+++ b/src/lib/ecordova/ecordova_geolocation.eo
@@ -96,13 +96,6 @@ class Ecordova.Geolocation (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Geolocation constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         current_position_get {
             [[Returns the device's current position to the geolocationSuccess
               callback with a Position object as the parameter. If there is an
@@ -141,9 +134,6 @@ class Ecordova.Geolocation (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         current,success: Ecordova_Geolocation_Position*;
         watch,success: Ecordova_Geolocation_Position*;
diff --git a/src/lib/ecordova/ecordova_globalization.eo b/src/lib/ecordova/ecordova_globalization.eo
index 6c3925ff78..128ccdf43d 100644
--- a/src/lib/ecordova/ecordova_globalization.eo
+++ b/src/lib/ecordova/ecordova_globalization.eo
@@ -190,13 +190,6 @@ class Ecordova.Globalization (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Globalization constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         preferred_language_get {
             [[Get the BCP 47 language tag for the client's current language.
 
@@ -369,9 +362,6 @@ class Ecordova.Globalization (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         preferred,language,success: const(Ecordova_Globalization_Language)*;
         locale,name,success: const(Ecordova_Globalization_Locale)*;
diff --git a/src/lib/ecordova/ecordova_media.eo b/src/lib/ecordova/ecordova_media.eo
index e64b2b3d8a..ee6a011d07 100644
--- a/src/lib/ecordova/ecordova_media.eo
+++ b/src/lib/ecordova/ecordova_media.eo
@@ -26,14 +26,14 @@ class Ecordova.Media (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
+        uri_set {
             [[Custom Ecordova_Media constructor.
-              @.constructor
+              @.uri_set
 
-              @since 2.3
+              @since 1.17
             ]]
             params {
-                src: const(char)*; [[A URI containing the audio content.]]
+                uri: const(char)*; [[A URI containing the audio content.]]
             }
         }
         current_position_get {
@@ -89,7 +89,7 @@ class Ecordova.Media (Eo.Base) {
         Eo.Base.destructor;
     }
     constructors {
-        .constructor;
+        .uri_set;
     }
     events {
         media,position: int;
diff --git a/src/lib/ecordova/ecordova_mediafile.eo b/src/lib/ecordova/ecordova_mediafile.eo
index b1ebd52eb5..e74dcf930b 100644
--- a/src/lib/ecordova/ecordova_mediafile.eo
+++ b/src/lib/ecordova/ecordova_mediafile.eo
@@ -24,20 +24,6 @@ class Ecordova.MediaFile (Ecordova.File) {
     [[Represents a single media file.]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_MediaFile constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-            params {
-                name: const(char)*; [[name of the file, without path information]]
-                url: const(char)*; [[the full path of the file, including the name]]
-                type: const(char)*; [[mime type]]
-                last_modified_date: time; [[last modified date]]
-                size: long; [[size of the file in bytes]]
-            }
-        }
         format_data_get {
             [[Retrieves format information about the media capture file.
 
@@ -52,9 +38,6 @@ class Ecordova.MediaFile (Ecordova.File) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         success: const(Ecordova_MediaFileData)*;
         error: const(Ecordova.Capture.Error)*;
diff --git a/src/lib/ecordova/ecordova_networkinformation.eo b/src/lib/ecordova/ecordova_networkinformation.eo
index bff5810354..5700244be5 100644
--- a/src/lib/ecordova/ecordova_networkinformation.eo
+++ b/src/lib/ecordova/ecordova_networkinformation.eo
@@ -16,13 +16,6 @@ class Ecordova.NetworkInformation (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_NetworkInformation constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         @property type {
             [[This property offers a fast way to determine the device's
               network connection state, and type of connection.]]
@@ -36,9 +29,6 @@ class Ecordova.NetworkInformation (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         offline;
         [[The event fires when an application goes offline, and the device is
diff --git a/src/lib/ecordova/ecordova_splashscreen.eo b/src/lib/ecordova/ecordova_splashscreen.eo
deleted file mode 100644
index 88346ad04c..0000000000
--- a/src/lib/ecordova/ecordova_splashscreen.eo
+++ /dev/null
@@ -1,29 +0,0 @@
-class Ecordova.Splashscreen (Eo.Base) {
-    [[Ecordova Splashscreen Plugin
-      Plugin ID: org.apache.cordova.splashscreen
-      http://plugins.cordova.io/#/package/org.apache.cordova.splashscreen
-    ]]
-    legacy_prefix: null;
-    methods {
-        constructor {
-            [[Custom Ecordova_Splashscreen constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
-        show {
-            [[Displays the splash screen.]]
-        }
-        hide {
-            [[Dismiss the splash screen.]]
-        }
-    }
-    implements {
-        Eo.Base.constructor;
-        Eo.Base.destructor;
-    }
-    constructors {
-        .constructor;
-    }
-}
diff --git a/src/lib/ecordova/ecordova_systeminfo.eo b/src/lib/ecordova/ecordova_systeminfo.eo
index 2405400396..58d3e52716 100644
--- a/src/lib/ecordova/ecordova_systeminfo.eo
+++ b/src/lib/ecordova/ecordova_systeminfo.eo
@@ -3,22 +3,10 @@ class Ecordova.SystemInfo (Eo.Base) {
       wrt-plugins-tizen SystemInfo.h
     ]]
     legacy_prefix: null;
-    methods {
-        constructor {
-            [[Custom Ecordova_SystemInfo constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
-    }
     implements {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
     events {
         battery,changed;
         [[This event fires when the percentage of battery charge changes by at
diff --git a/src/lib/ecordova/ecordova_vibration.eo b/src/lib/ecordova/ecordova_vibration.eo
index 498791024f..5e2f43761a 100644
--- a/src/lib/ecordova/ecordova_vibration.eo
+++ b/src/lib/ecordova/ecordova_vibration.eo
@@ -5,13 +5,6 @@ class Ecordova.Vibration (Eo.Base) {
     ]]
     legacy_prefix: null;
     methods {
-        constructor {
-            [[Custom Ecordova_Vibration constructor.
-              @.constructor
-
-              @since 2.3
-            ]]
-        }
         vibrate {
             [[This function has three different functionalities based on
               parameters passed to it.]]
@@ -24,7 +17,4 @@ class Ecordova.Vibration (Eo.Base) {
         Eo.Base.constructor;
         Eo.Base.destructor;
     }
-    constructors {
-        .constructor;
-    }
 }
diff --git a/src/modules/ecordova/linux/ecordova_console.c b/src/modules/ecordova/linux/ecordova_console.c
index 53ffed0d75..1baa282302 100644
--- a/src/modules/ecordova/linux/ecordova_console.c
+++ b/src/modules/ecordova/linux/ecordova_console.c
@@ -7,7 +7,6 @@
 
 #include "ecordova_console_private.h"
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -59,13 +58,6 @@ _ecordova_console_eo_base_constructor(Eo *obj, Ecordova_Console_Data *pd)
 }
 
 static void
-_ecordova_console_constructor(Eo *obj EINA_UNUSED,
-                              Ecordova_Console_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_console_eo_base_destructor(Eo *obj,
                                      Ecordova_Console_Data *pd EINA_UNUSED)
 {
diff --git a/src/modules/ecordova/linux/ecordova_directoryentry.c b/src/modules/ecordova/linux/ecordova_directoryentry.c
index e1bd724e59..dfa4e0d876 100644
--- a/src/modules/ecordova/linux/ecordova_directoryentry.c
+++ b/src/modules/ecordova/linux/ecordova_directoryentry.c
@@ -46,7 +46,7 @@ extern int _ecordova_log_dom;
 #define MY_CLASS_NAME "Ecordova_DirectoryEntry"
 
 static void _remove_notify(Eo *, void *);
-static bool _is_absolute(const char *);
+static Eina_Bool _is_absolute(const char *);
 static void _directory_get(Eo *, void *);
 static void _file_get(Eo *, void *);
 static void _eio_directory_get_cb(void *, Eio_File *, const Eina_Stat *);
@@ -65,24 +65,9 @@ _ecordova_directoryentry_eo_base_constructor(Eo *obj,
 
    pd->obj = obj;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_directoryentry_constructor(Eo *obj,
-                                     Ecordova_DirectoryEntry_Data *pd EINA_UNUSED,
-                                     const char *name,
-                                     const char *path,
-                                     Ecordova_FileSystem *file_system,
-                                     const char *url)
-{
-   DBG("(%p)", obj);
-   eo_do_super(obj, MY_CLASS, ecordova_entry_constructor(EINA_FALSE,
-                                                        EINA_TRUE,
-                                                        name,
-                                                        path,
-                                                        file_system,
-                                                        url));
+   eo_do_super(obj, MY_CLASS, obj = eo_constructor());
+   ecordova_entry_file_is_set(EINA_FALSE);
+   return obj;
 }
 
 static void
@@ -102,7 +87,7 @@ _ecordova_directoryentry_reader_create(Eo *obj,
    EINA_SAFETY_ON_NULL_RETURN_VAL(super, NULL);
 
    return eo_add(ECORDOVA_DIRECTORYREADER_CLASS, NULL,
-     ecordova_directoryreader_constructor(super->native));
+     ecordova_directoryreader_native_set(super->native));
 }
 
 static void
@@ -147,7 +132,8 @@ _eio_directory_get_cb(void *user_data,
    Eio_Operation_Data *data = user_data;
    DBG("(%p)", data->pd->obj);
    Ecordova_DirectoryEntry *directory = eo_add(ECORDOVA_DIRECTORYENTRY_CLASS, NULL,
-     ecordova_directoryentry_constructor(data->name, data->path, NULL, data->native)); // TODO: filesystem?
+                                               ecordova_entry_name_set(data->name),
+                                               ecordova_entry_path_set(data->path));
 
    data->success_cb(data->pd->obj, directory);
    _data_free(data);
@@ -160,7 +146,8 @@ _eio_file_get_cb(void *user_data,
 {
    Eio_Operation_Data *data = user_data;
    Ecordova_FileEntry *file = eo_add(ECORDOVA_FILEENTRY_CLASS, NULL,
-     ecordova_fileentry_constructor(data->name, data->path, NULL, data->native)); // TODO: filesystem?
+                                     ecordova_entry_name_set(data->name),
+                                     ecordova_entry_path_set(data->path));
 
    data->success_cb(data->pd->obj, file);
    _data_free(data);
@@ -225,7 +212,8 @@ _eio_create_file_cb(void *user_data,
    fclose(fd);
 
    Ecordova_FileEntry *file = eo_add(ECORDOVA_FILEENTRY_CLASS, NULL,
-     ecordova_fileentry_constructor(data->name, data->path, NULL, data->native)); // TODO: filesystem?
+                                     ecordova_entry_name_set(data->name),
+                                     ecordova_entry_path_set(data->path));
    data->success_cb(data->pd->obj, file);
    _data_free(data);
 }
@@ -236,7 +224,8 @@ _eio_mkdir_cb(void *user_data, Eio_File *handler EINA_UNUSED)
    Eio_Operation_Data *data = user_data;
    DBG("(%p)", data->pd->obj);
    Ecordova_DirectoryEntry *directory = eo_add(ECORDOVA_DIRECTORYENTRY_CLASS, NULL,
-     ecordova_directoryentry_constructor(data->name, data->path, NULL, data->native)); // TODO: filesystem?
+                                               ecordova_entry_name_set(data->name),
+                                               ecordova_entry_path_set(data->path));
    data->success_cb(data->pd->obj, directory);
    _data_free(data);
 }
@@ -267,7 +256,7 @@ _ecordova_directoryentry_recursively_remove(Eo *obj,
    Ecordova_Entry_Data *super = eo_data_scope_get(obj, ECORDOVA_ENTRY_CLASS);
    EINA_SAFETY_ON_NULL_RETURN(super);
 
-   _entry_remove(super, _remove_notify, _error_notify, true);
+   _entry_remove(super, _remove_notify, _error_notify, EINA_TRUE);
 }
 
 static void
@@ -310,7 +299,7 @@ _remove_notify(Eo *obj, void *data EINA_UNUSED)
      eo_event_callback_call(ECORDOVA_DIRECTORYENTRY_EVENT_REMOVE_SUCCESS, NULL));
 }
 
-static bool
+static Eina_Bool
 _is_absolute(const char *path)
 {
    // TODO: not multiplatform
diff --git a/src/modules/ecordova/linux/ecordova_directoryreader.c b/src/modules/ecordova/linux/ecordova_directoryreader.c
index 7164887751..cc781a3364 100644
--- a/src/modules/ecordova/linux/ecordova_directoryreader.c
+++ b/src/modules/ecordova/linux/ecordova_directoryreader.c
@@ -70,15 +70,20 @@ _ecordova_directoryreader_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_directoryreader_constructor(Eo *obj,
-                                      Ecordova_DirectoryReader_Data *pd,
-                                      const char *native)
+_ecordova_directoryreader_native_set(Eo *obj,
+                                     Ecordova_DirectoryReader_Data *pd,
+                                     const char *native)
 {
    DBG("(%p) url=%s", obj, native);
-   fprintf(stderr, "%s:%s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
    pd->native = strdup(native);
 }
 
+static const char*
+_ecordova_directoryreader_native_get(Eo *obj EINA_UNUSED, Ecordova_DirectoryReader_Data *pd)
+{
+   return pd->native;
+}
+
 static void
 _ecordova_directoryreader_eo_base_destructor(Eo *obj,
                                              Ecordova_DirectoryReader_Data *pd)
@@ -149,13 +154,15 @@ _main_cb(void *user_data,
       case EINA_FILE_DIR:
         {
            entry = eo_add(ECORDOVA_DIRECTORYENTRY_CLASS, NULL,
-             ecordova_directoryentry_constructor(name, path, NULL, info->path)); // TODO: filesystem?
+                          ecordova_entry_name_set(name),
+                          ecordova_entry_path_set(path));
            break;
         }
       case EINA_FILE_REG:
         {
            entry = eo_add(ECORDOVA_FILEENTRY_CLASS, NULL,
-             ecordova_fileentry_constructor(name, path, NULL, info->path)); // TODO: filesystem?
+                          ecordova_entry_name_set(name),
+                          ecordova_entry_path_set(path));
            break;
         }
       // TODO: case EINA_FILE_LNK ?
diff --git a/src/modules/ecordova/linux/ecordova_entry.c b/src/modules/ecordova/linux/ecordova_entry.c
index 0d2e31c7ee..b405efc235 100644
--- a/src/modules/ecordova/linux/ecordova_entry.c
+++ b/src/modules/ecordova/linux/ecordova_entry.c
@@ -52,12 +52,14 @@ static void _remove_notify(Eo *, void *);
 static Eina_Bool _eio_remove_non_recursively_filter_cb(void *, Eio_File *, const Eina_File_Direct_Info *);
 static void _parent_get_cb(void *, Eio_File *, const Eina_Stat *);
 static void _parent_get_notify(Eo *, void *);
+static void _sync_native(Ecordova_Entry_Data* pd);
 
 static Eo_Base *
 _ecordova_entry_eo_base_constructor(Eo *obj, Ecordova_Entry_Data *pd)
 {
    DBG("(%p)", obj);
 
+   pd->is_file = EINA_TRUE;
    pd->obj = obj;
    pd->name = NULL;
    pd->path = NULL;
@@ -69,30 +71,6 @@ _ecordova_entry_eo_base_constructor(Eo *obj, Ecordova_Entry_Data *pd)
 }
 
 static void
-_ecordova_entry_constructor(Eo *obj,
-                            Ecordova_Entry_Data *pd,
-                            Eina_Bool file_is,
-                            Eina_Bool directory_is,
-                            const char *name,
-                            const char *path,
-                            Ecordova_FileSystem *file_system,
-                            const char *url)
-{
-   EINA_SAFETY_ON_NULL_RETURN(name);
-   EINA_SAFETY_ON_NULL_RETURN(path);
-   //EINA_SAFETY_ON_NULL_RETURN(file_system);
-   EINA_SAFETY_ON_NULL_RETURN(url);
-   DBG("(%p) name=%s, path=%s, url=%s", obj, name, path, url);
-
-   pd->is_file = file_is;
-   pd->is_directory = directory_is;
-   pd->name = strdup(name);
-   pd->path = strdup(path);
-   pd->file_system = eo_ref(file_system);
-   pd->native = strdup(url);
-}
-
-static void
 _ecordova_entry_eo_base_destructor(Eo *obj, Ecordova_Entry_Data *pd)
 {
    DBG("(%p)", obj);
@@ -145,7 +123,6 @@ _ecordova_entry_move(Eo *obj EINA_UNUSED,
    data->path = strdup(dest_dir->native);
 
    // TODO: file_system?
-
    size_t len = strlen(data->path) + 1 + strlen(data->name) + 1;
    data->native = malloc(len);
    EINA_SAFETY_ON_NULL_GOTO(data->native, on_error);
@@ -231,14 +208,14 @@ static void
 _ecordova_entry_remove(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd)
 {
    DBG("(%p)", obj);
-   _entry_remove(pd, _remove_notify, _error_notify, false);
+   _entry_remove(pd, _remove_notify, _error_notify, EINA_FALSE);
 }
 
 void
 _entry_remove(Ecordova_Entry_Data *pd,
               Ecordova_Entry_Success_Callback success_cb,
               Ecordova_Entry_Error_Callback error_cb,
-              bool recursively)
+              Eina_Bool recursively)
 {
    DBG("(%p)", pd->obj);
 
@@ -304,10 +281,8 @@ _parent_get_notify(Eo *obj, void *data)
    Ecordova_DirectoryEntry *parent =
      eo_add(ECORDOVA_DIRECTORYENTRY_CLASS,
             NULL,
-            ecordova_directoryentry_constructor(name,
-                                                path,
-                                                NULL, // TODO: filesystem ?
-                                                url));
+            ecordova_entry_name_set(name),
+            ecordova_entry_path_set(path));
    free(name);
    free(path);
    free(url);
@@ -325,7 +300,31 @@ _ecordova_entry_file_is_get(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd)
 static Eina_Bool
 _ecordova_entry_directory_is_get(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd)
 {
-   return pd->is_directory;
+   return !pd->is_file;
+}
+
+static void
+_ecordova_entry_file_is_set(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd, Eina_Bool is_file)
+{
+    pd->is_file = is_file;
+}
+
+static void
+_ecordova_entry_directory_is_set(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd, Eina_Bool is_dir)
+{
+    pd->is_file = !is_dir;
+}
+
+static void
+_ecordova_entry_name_set(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd, const char* name)
+{
+   if(pd->name)
+     free(pd->name);
+   pd->name = strdup(name);
+   if(pd->path)
+     {
+       _sync_native(pd);
+     }
 }
 
 static const char *
@@ -340,6 +339,18 @@ _ecordova_entry_path_get(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd)
    return pd->path;
 }
 
+static void
+_ecordova_entry_path_set(Eo *obj EINA_UNUSED, Ecordova_Entry_Data *pd, const char* path)
+{
+   if(pd->path)
+     free(pd->path);
+   pd->path = strdup(path);
+   if(pd->name)
+     {
+       _sync_native(pd);
+     }
+}
+
 void
 _metadata_get(Ecordova_Entry_Data *pd,
               Ecordova_Entry_Success_Callback success_cb,
@@ -428,17 +439,13 @@ _eio_copied_cb(void *user_data, Eio_File *handler EINA_UNUSED)
    if (data->pd->is_file)
      entry = eo_add(ECORDOVA_FILEENTRY_CLASS,
                     NULL,
-                    ecordova_fileentry_constructor(data->name,
-                                                   data->path,
-                                                   data->pd->file_system,
-                                                   data->native));
+                    ecordova_entry_name_set(data->name),
+                    ecordova_entry_path_set(data->path));
    else
      entry = eo_add(ECORDOVA_DIRECTORYENTRY_CLASS,
                     NULL,
-                    ecordova_directoryentry_constructor(data->name,
-                                                        data->path,
-                                                        data->pd->file_system,
-                                                        data->native));
+                    ecordova_entry_name_set(data->name),
+                    ecordova_entry_path_set(data->path));
 
    data->success_cb(data->pd->obj, entry);
 
@@ -537,6 +544,16 @@ _translate_errno(int error)
    return -1;
 }
 
+void _sync_native(Ecordova_Entry_Data* pd)
+{
+  if(pd->native)
+    free(pd->native);
+  size_t len = strlen(pd->path) + 1 + strlen(pd->name) + 1;
+  pd->native = malloc(len);
+  if(pd->native)
+    snprintf(pd->native, len, "%s/%s", pd->path, pd->name);
+}
+
 #include "undefs.h"
 
 #define ecordova_entry_class_get ecordova_entry_impl_class_get
diff --git a/src/modules/ecordova/linux/ecordova_entry_private.h b/src/modules/ecordova/linux/ecordova_entry_private.h
index a50f250f81..c9a7117cac 100644
--- a/src/modules/ecordova/linux/ecordova_entry_private.h
+++ b/src/modules/ecordova/linux/ecordova_entry_private.h
@@ -5,8 +5,6 @@
 
 #include <Eio.h>
 
-#include <stdbool.h>
-
 typedef struct _Ecordova_Entry_Data Ecordova_Entry_Data;
 
 /**
@@ -16,7 +14,6 @@ struct _Ecordova_Entry_Data
 {
    Eo                  *obj;
    Eina_Bool            is_file;
-   Eina_Bool            is_directory;
    char                *name;
    char                *path;
    Ecordova_FileSystem *file_system;
@@ -42,7 +39,7 @@ typedef struct
 Eio_Operation_Data *_data_new(Ecordova_Entry_Data *, Ecordova_Entry_Success_Callback, Ecordova_Entry_Error_Callback);
 void _data_free(Eio_Operation_Data *);
 void _metadata_get(Ecordova_Entry_Data *, Ecordova_Entry_Success_Callback, Ecordova_Entry_Error_Callback);
-void _entry_remove(Ecordova_Entry_Data *, Ecordova_Entry_Success_Callback, Ecordova_Entry_Error_Callback, bool);
+void _entry_remove(Ecordova_Entry_Data *, Ecordova_Entry_Success_Callback, Ecordova_Entry_Error_Callback, Eina_Bool);
 void _error_notify(Eo *, int);
 void _eio_error_cb(void *, Eio_File *, int);
 void _eio_removed_cb(void *, Eio_File *);
diff --git a/src/modules/ecordova/linux/ecordova_fileentry.c b/src/modules/ecordova/linux/ecordova_fileentry.c
index 273c28dac3..7ab349ee40 100644
--- a/src/modules/ecordova/linux/ecordova_fileentry.c
+++ b/src/modules/ecordova/linux/ecordova_fileentry.c
@@ -49,24 +49,9 @@ _ecordova_fileentry_eo_base_constructor(Eo *obj, Ecordova_FileEntry_Data *pd)
 
    pd->obj = obj;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_fileentry_constructor(Eo *obj,
-                                Ecordova_FileEntry_Data *pd EINA_UNUSED,
-                                const char *name,
-                                const char *path,
-                                Ecordova_FileSystem *file_system,
-                                const char *url)
-{
-   DBG("(%p)", obj);
-   eo_do_super(obj, MY_CLASS, ecordova_entry_constructor(EINA_TRUE,
-                                                         EINA_FALSE,
-                                                         name,
-                                                         path,
-                                                         file_system,
-                                                         url));
+   eo_do_super(obj, MY_CLASS, obj = eo_constructor());
+   ecordova_entry_file_is_set(EINA_TRUE);
+   return obj;
 }
 
 static void
@@ -128,7 +113,7 @@ _writer_create(Eo *obj, void *data)
    const Ecordova_Metadata *metadata = data;
    Ecordova_File *file = _create_file(obj, metadata);
    Ecordova_FileWriter *writer = eo_add(ECORDOVA_FILEWRITER_CLASS, NULL,
-     ecordova_filewriter_constructor(file));
+     ecordova_filewriter_file_set(file));
 
    eo_do(obj,
          eo_event_callback_call(ECORDOVA_FILEENTRY_EVENT_CREATE_WRITER, writer));
diff --git a/src/modules/ecordova/linux/ecordova_filereader.c b/src/modules/ecordova/linux/ecordova_filereader.c
index 70f26af4ff..5407ef6bf4 100644
--- a/src/modules/ecordova/linux/ecordova_filereader.c
+++ b/src/modules/ecordova/linux/ecordova_filereader.c
@@ -7,6 +7,10 @@
 
 #include <Eio.h>
 
+#ifdef EAPI
+#undef EAPI
+#endif
+
 #ifdef _WIN32
 # ifdef DLL_EXPORT
 #  define EAPI __declspec(dllexport)
@@ -58,14 +62,9 @@ _ecordova_filereader_eo_base_constructor(Eo *obj, Ecordova_FileReader_Data *pd)
    pd->offset = 0;
    pd->length = 0;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_filereader_constructor(Eo *obj EINA_UNUSED,
-                                 Ecordova_FileReader_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
+   eo_do_super(obj, MY_CLASS, obj = eo_constructor());
+   ecordova_entry_file_is_set(EINA_TRUE);
+   return obj;
 }
 
 static void
diff --git a/src/modules/ecordova/linux/ecordova_filetransfer.c b/src/modules/ecordova/linux/ecordova_filetransfer.c
index 72bb4f040b..9eaaa681e1 100644
--- a/src/modules/ecordova/linux/ecordova_filetransfer.c
+++ b/src/modules/ecordova/linux/ecordova_filetransfer.c
@@ -80,14 +80,9 @@ _ecordova_filetransfer_eo_base_constructor(Eo *obj,
    pd->obj = obj;
    pd->job = NULL;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_filetransfer_constructor(Eo *obj EINA_UNUSED,
-                                   Ecordova_FileTransfer_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
+   eo_do_super(obj, MY_CLASS, obj = eo_constructor());
+   eo_do(obj, ecordova_entry_file_is_set(EINA_TRUE));
+   return obj;
 }
 
 static void
@@ -228,8 +223,8 @@ _download_progress_cb(void *data,
    DBG("(%p)", pd->obj);
    Ecordova_ProgressEvent event = {
       .type = "download",
-      .cancelable = true,
-      .length_computable = true,
+      .cancelable = EINA_TRUE,
+      .length_computable = EINA_TRUE,
       .loaded = dlnow,
       .total = dltotal,
       .target = pd->obj
@@ -253,7 +248,8 @@ _download_completion_cb(void *data, const char *file, int status)
         split_path(NULL, file, &path, &name, &native);
 
         Ecordova_FileEntry *file_entry = eo_add(ECORDOVA_FILEENTRY_CLASS, NULL,
-          ecordova_fileentry_constructor(name, path, NULL, native)); // TODO: filesystem?
+                                                ecordova_entry_name_set(name),
+                                                ecordova_entry_path_set(path));
         eo_do(pd->obj,
               eo_event_callback_call(ECORDOVA_FILETRANSFER_EVENT_DOWNLOAD_SUCCESS, file_entry));
         eo_unref(file_entry);
@@ -491,8 +487,8 @@ _url_progress_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event_info)
 
    Ecordova_ProgressEvent event = {
       .type = "upload",
-      .cancelable = false,
-      .length_computable = true,
+      .cancelable = EINA_FALSE,
+      .length_computable = EINA_TRUE,
       .loaded = url_progress->up.now,
       .total = url_progress->up.total,
       .target = pd->obj
diff --git a/src/modules/ecordova/linux/ecordova_filewriter.c b/src/modules/ecordova/linux/ecordova_filewriter.c
index fd048d1f06..735b317419 100644
--- a/src/modules/ecordova/linux/ecordova_filewriter.c
+++ b/src/modules/ecordova/linux/ecordova_filewriter.c
@@ -5,7 +5,6 @@
 #include "ecordova_filewriter_private.h"
 #include "ecordova_entry_private.h"
 
-#include <stdbool.h>
 #include <unistd.h>
 
 #ifdef EAPI
@@ -44,8 +43,8 @@ extern int _ecordova_log_dom;
 
 static void _write_cb(void *, Ecore_Thread *);
 static void _truncate_cb(void *, Ecore_Thread *);
-static bool _stream_init(Ecordova_FileWriter_Data *);
-static bool _offset_set(Ecordova_FileWriter_Data *);
+static Eina_Bool _stream_init(Ecordova_FileWriter_Data *);
+static Eina_Bool _offset_set(Ecordova_FileWriter_Data *);
 static void _write_end_cb(void *, Ecore_Thread *);
 static void _write_abort_cb(void *, Ecore_Thread *);
 static void _write_progress_cb(void *, Ecore_Thread *, void *);
@@ -68,13 +67,15 @@ _ecordova_filewriter_eo_base_constructor(Eo *obj,
    pd->data_size = 0;
    pd->truncate_size = 0;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   eo_do_super(obj, MY_CLASS, obj = eo_constructor());
+   eo_do(obj, ecordova_entry_file_is_set(EINA_TRUE));
+   return obj;
 }
 
 static void
-_ecordova_filewriter_constructor(Eo *obj,
-                                 Ecordova_FileWriter_Data *pd,
-                                 Ecordova_File *file)
+_ecordova_filewriter_file_set(Eo *obj,
+                              Ecordova_FileWriter_Data *pd,
+                              Ecordova_File *file)
 {
    DBG("(%p)", obj);
    EINA_SAFETY_ON_NULL_RETURN(file);
@@ -278,30 +279,30 @@ _truncate_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
    pd->offset = MIN(pd->offset, pd->truncate_size);
 }
 
-static bool
+static Eina_Bool
 _stream_init(Ecordova_FileWriter_Data *pd)
 {
    pd->stream = fopen(pd->url, "rb+");
    if (!pd->stream)
      {
         pd->error = _translate_errno(errno);
-        return false;
+        return EINA_FALSE;
      }
 
-  return true;
+  return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _offset_set(Ecordova_FileWriter_Data *pd)
 {
   int error = fseek(pd->stream, pd->offset, SEEK_SET);
   if (error)
     {
        pd->error = _translate_errno(errno);
-       return false;
+       return EINA_FALSE;
     }
 
-  return true;
+  return EINA_TRUE;
 }
 
 static void
diff --git a/src/modules/ecordova/tizen/ecordova_batterystatus.c b/src/modules/ecordova/tizen/ecordova_batterystatus.c
index a864e733df..246c3ba970 100644
--- a/src/modules/ecordova/tizen/ecordova_batterystatus.c
+++ b/src/modules/ecordova/tizen/ecordova_batterystatus.c
@@ -7,7 +7,6 @@
 
 #include <vconf.h>
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -22,8 +21,8 @@ static Eina_Bool _del_cb(void *, Eo *, const Eo_Event_Description *, void *);
 static void _start(Ecordova_BatteryStatus_Data *);
 static void _stop(Ecordova_BatteryStatus_Data *);
 static Eina_Bool _on_battery_changed(void *, Eo *, const Eo_Event_Description *, void *);
-static bool _fetch_level(int *);
-static bool _fetch_charging_is(Eina_Bool *);
+static Eina_Bool _fetch_level(int *);
+static Eina_Bool _fetch_charging_is(Eina_Bool *);
 
 static Eo_Base *
 _ecordova_batterystatus_eo_base_constructor(Eo *obj,
@@ -33,17 +32,10 @@ _ecordova_batterystatus_eo_base_constructor(Eo *obj,
 
    pd->obj = obj;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_batterystatus_constructor(Eo *obj,
-                                    Ecordova_BatteryStatus_Data *pd)
-{
-   DBG("(%p)", obj);
-
    eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _add_cb, pd));
    eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _del_cb, pd));
+
+   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
 }
 
 static void
@@ -129,11 +121,11 @@ _stop(Ecordova_BatteryStatus_Data *pd)
                            pd));
 }
 
-static bool
+static Eina_Bool
 _fetch_level(int *level)
 {
     int value = 0;
-    bool ret = vconf_get_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, &value) == 0;
+    Eina_Bool ret = vconf_get_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, &value) == 0;
     if (ret)
       ERR("%s", "Failed to get battery capacity");
 
@@ -141,7 +133,7 @@ _fetch_level(int *level)
     return ret;
 }
 
-static bool
+static Eina_Bool
 _fetch_charging_is(Eina_Bool *charging_is)
 {
     int value = 0;
diff --git a/src/modules/ecordova/tizen/ecordova_contact.c b/src/modules/ecordova/tizen/ecordova_contact.c
index fbb88b4e77..2a26ecd494 100644
--- a/src/modules/ecordova/tizen/ecordova_contact.c
+++ b/src/modules/ecordova/tizen/ecordova_contact.c
@@ -14,7 +14,6 @@
 #include <contacts.h>
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -28,12 +27,12 @@ static Eina_Array *_contactorganization_array_copy(Eina_Array *);
 static void _contactfield_array_free(Eina_Array *);
 static void _contactaddress_array_free(Eina_Array *);
 static void _contactorganization_array_free(Eina_Array *);
-static bool _ecordova_contactfields_import(Eina_Array *, contacts_record_h, const Ecordova_ContactField_Metadata);
-static bool _ecordova_contactfields_export(Eina_Array *, contacts_record_h, const Ecordova_ContactField_Metadata);
-static bool _ecordova_contactaddresses_import(Eina_Array *, contacts_record_h);
-static bool _ecordova_contactaddresses_export(Eina_Array *, contacts_record_h);
-static bool _ecordova_contactorganizations_import(Eina_Array *, contacts_record_h);
-static bool _ecordova_contactorganizations_export(Eina_Array *, contacts_record_h);
+static Eina_Bool _ecordova_contactfields_import(Eina_Array *, contacts_record_h, const Ecordova_ContactField_Metadata);
+static Eina_Bool _ecordova_contactfields_export(Eina_Array *, contacts_record_h, const Ecordova_ContactField_Metadata);
+static Eina_Bool _ecordova_contactaddresses_import(Eina_Array *, contacts_record_h);
+static Eina_Bool _ecordova_contactaddresses_export(Eina_Array *, contacts_record_h);
+static Eina_Bool _ecordova_contactorganizations_import(Eina_Array *, contacts_record_h);
+static Eina_Bool _ecordova_contactorganizations_export(Eina_Array *, contacts_record_h);
 static void _contactfield_array_clear_id(Eina_Array *);
 static void _contactaddress_array_clear_id(Eina_Array *);
 static void _contactorganization_array_clear_id(Eina_Array *);
@@ -75,7 +74,7 @@ _ecordova_contact_eo_base_destructor(Eo *obj, Ecordova_Contact_Data *pd)
    _contactfield_array_free(pd->categories);
    _contactfield_array_free(pd->urls);
 
-   int ret = contacts_record_destroy(pd->record, true);
+   int ret = contacts_record_destroy(pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 
    eo_do_super(obj, MY_CLASS, eo_destructor());
@@ -176,7 +175,7 @@ _ecordova_contact_save(Eo *obj, Ecordova_Contact_Data *pd)
              goto on_error;
           }
 
-        ret = contacts_record_destroy(pd->record, true);
+        ret = contacts_record_destroy(pd->record, EINA_TRUE);
         if (CONTACTS_ERROR_NONE != ret)
           {
              ERR("Error destroying record: %d", ret);
@@ -280,7 +279,7 @@ _ecordova_contact_nickname_set(Eo *obj EINA_UNUSED,
    return;
 
 on_error:
-   ret = contacts_record_destroy(child_record, true);
+   ret = contacts_record_destroy(child_record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 }
 
@@ -425,7 +424,7 @@ _ecordova_contact_note_set(Eo *obj EINA_UNUSED,
    return;
 
 on_error:
-   ret = contacts_record_destroy(child_record, true);
+   ret = contacts_record_destroy(child_record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 }
 
@@ -778,68 +777,68 @@ _contact_url_metadata = {
   .label2type = ecordova_contacturl_label2type
 };
 
-bool
+Eina_Bool
 ecordova_contact_import(Ecordova_Contact *obj,
                         contacts_record_h contacts_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    Ecordova_Contact_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACT_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    int ret;
 
-   ret = contacts_record_destroy(pd->record, true);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   ret = contacts_record_destroy(pd->record, EINA_TRUE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    ret = contacts_record_clone(contacts_record, &pd->record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    ret = contacts_record_get_int(pd->record, _contacts_contact.id, &pd->id);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    // name
    DBG("%s", "Importing name");
    if (!ecordova_contactname_import(pd->name, pd->record))
-     return false;
+     return EINA_FALSE;
 
    // phone_numbers
    DBG("%s", "Importing phone_numbers");
    if (!_ecordova_contactfields_import(pd->phone_numbers,
                                        pd->record,
                                        _contact_number_metadata))
-     return false;
+     return EINA_FALSE;
 
    // emails
    DBG("%s", "Importing emails");
    if (!_ecordova_contactfields_import(pd->emails,
                                        pd->record,
                                        _contact_email_metadata))
-     return false;
+     return EINA_FALSE;
 
    // addresses
    DBG("%s", "Importing addresses");
    if (!_ecordova_contactaddresses_import(pd->addresses, pd->record))
-     return false;
+     return EINA_FALSE;
 
    // ims
    DBG("%s", "Importing ims");
    if (!_ecordova_contactfields_import(pd->ims,
                                        pd->record,
                                        _contact_messenger_metadata))
-     return false;
+     return EINA_FALSE;
 
    // organizations
    DBG("%s", "Importing organizations");
    if (!_ecordova_contactorganizations_import(pd->organizations, pd->record))
-     return false;
+     return EINA_FALSE;
 
    // photos
    DBG("%s", "Importing photos");
    if (!_ecordova_contactfields_import(pd->photos,
                                        pd->record,
                                        _contact_image_metadata))
-     return false;
+     return EINA_FALSE;
 
    // TODO: categories
 
@@ -848,57 +847,57 @@ ecordova_contact_import(Ecordova_Contact *obj,
    if (!_ecordova_contactfields_import(pd->urls,
                                        pd->record,
                                        _contact_url_metadata))
-     return false;
+     return EINA_FALSE;
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 ecordova_contact_export(Ecordova_Contact *obj,
                         contacts_record_h contacts_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    Ecordova_Contact_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACT_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    // name
    if (!clear_all_contact_record(contacts_record, _contacts_contact.name) ||
        !ecordova_contactname_export(pd->name, contacts_record))
-     return false;
+     return EINA_FALSE;
 
    // phone_numbers
    if (!_ecordova_contactfields_export(pd->phone_numbers,
                                        contacts_record,
                                        _contact_number_metadata))
-     return false;
+     return EINA_FALSE;
 
    // emails
    if (!_ecordova_contactfields_export(pd->emails,
                                        contacts_record,
                                        _contact_email_metadata))
-     return false;
+     return EINA_FALSE;
 
    // addresses
    if (!_ecordova_contactaddresses_export(pd->addresses, contacts_record))
-     return false;
+     return EINA_FALSE;
 
    // ims
    if (!_ecordova_contactfields_export(pd->ims,
                                        contacts_record,
                                        _contact_messenger_metadata))
-     return false;
+     return EINA_FALSE;
 
    // organizations
    if (!_ecordova_contactorganizations_export(pd->organizations, contacts_record))
-     return false;
+     return EINA_FALSE;
 
    // photos
    if (!_ecordova_contactfields_export(pd->photos,
                                        contacts_record,
                                        _contact_image_metadata))
-     return false;
+     return EINA_FALSE;
 
    // TODO: categories
 
@@ -906,12 +905,12 @@ ecordova_contact_export(Ecordova_Contact *obj,
    if (!_ecordova_contactfields_export(pd->urls,
                                        contacts_record,
                                        _contact_url_metadata))
-     return false;
+     return EINA_FALSE;
 
-   return true;
+   return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _ecordova_contactfields_import(Eina_Array *fields,
                                contacts_record_h contacts_record,
                                const Ecordova_ContactField_Metadata metadata)
@@ -921,7 +920,7 @@ _ecordova_contactfields_import(Eina_Array *fields,
    ret = contacts_record_get_child_record_count(contacts_record,
                                                 *metadata.ids[ECORDOVA_CONTACTFIELD_PARENT_PROPERTY_ID],
                                                 &count);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    DBG("Importing %d children", count);
    for (int index = 0; index < count; ++index)
@@ -931,30 +930,30 @@ _ecordova_contactfields_import(Eina_Array *fields,
                                                     *metadata.ids[ECORDOVA_CONTACTFIELD_PARENT_PROPERTY_ID],
                                                     index,
                                                     &child_record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
         Ecordova_ContactField *field = eo_add(ECORDOVA_CONTACTFIELD_CLASS, NULL);
         if (!ecordova_contactfield_import(field, child_record, metadata))
           {
              eo_unref(field);
-             return false;
+             return EINA_FALSE;
           }
 
         Eina_Bool ret = eina_array_push(fields, field);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EINA_FALSE);
      }
 
-   return true;
+   return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _ecordova_contactfields_export(Eina_Array *fields,
                                contacts_record_h contacts_record,
                                const Ecordova_ContactField_Metadata metadata)
 {
    if (!clear_all_contact_record(contacts_record,
                                  *metadata.ids[ECORDOVA_CONTACTFIELD_PARENT_PROPERTY_ID]))
-     return false;
+     return EINA_FALSE;
 
    Ecordova_ContactField *field;
    Eina_Array_Iterator iterator;
@@ -963,25 +962,25 @@ _ecordova_contactfields_export(Eina_Array *fields,
      {
         contacts_record_h record = NULL;
         int ret = contacts_record_create(*metadata.uri, &record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
         if (!ecordova_contactfield_export(field, record, metadata))
           {
-             ret = contacts_record_destroy(record, true);
-             EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
-             return false;
+             ret = contacts_record_destroy(record, EINA_TRUE);
+             EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
+             return EINA_FALSE;
           }
 
         ret = contacts_record_add_child_record(contacts_record,
                                                *metadata.ids[ECORDOVA_CONTACTFIELD_PARENT_PROPERTY_ID],
                                                record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
      }
 
-   return true;
+   return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _ecordova_contactaddresses_import(Eina_Array *fields,
                                   contacts_record_h contacts_record)
 {
@@ -990,7 +989,7 @@ _ecordova_contactaddresses_import(Eina_Array *fields,
    ret = contacts_record_get_child_record_count(contacts_record,
                                                 _contacts_contact.address,
                                                 &count);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    DBG("Importing %d addresses", count);
    for (int index = 0; index < count; ++index)
@@ -1000,28 +999,28 @@ _ecordova_contactaddresses_import(Eina_Array *fields,
                                                     _contacts_contact.address,
                                                     index,
                                                     &child_record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
         Ecordova_ContactAddress *address = eo_add(ECORDOVA_CONTACTADDRESS_CLASS, NULL);
         if (!ecordova_contactaddress_import(address, child_record))
           {
              eo_unref(address);
-             return false;
+             return EINA_FALSE;
           }
 
         Eina_Bool ret = eina_array_push(fields, address);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EINA_FALSE);
      }
 
-   return true;
+   return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _ecordova_contactaddresses_export(Eina_Array *addresses,
                                   contacts_record_h contacts_record)
 {
    if (!clear_all_contact_record(contacts_record, _contacts_contact.address))
-     return false;
+     return EINA_FALSE;
 
    Ecordova_ContactAddress *address;
    Eina_Array_Iterator iterator;
@@ -1030,25 +1029,25 @@ _ecordova_contactaddresses_export(Eina_Array *addresses,
      {
         contacts_record_h record = NULL;
         int ret = contacts_record_create(_contacts_address._uri, &record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
         if (!ecordova_contactaddress_export(address, record))
           {
-             ret = contacts_record_destroy(record, true);
-             EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
-             return false;
+             ret = contacts_record_destroy(record, EINA_TRUE);
+             EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
+             return EINA_FALSE;
           }
 
         ret = contacts_record_add_child_record(contacts_record,
                                                _contacts_contact.address,
                                                record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
      }
 
-   return true;
+   return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _ecordova_contactorganizations_import(Eina_Array *organizations,
                                       contacts_record_h contacts_record)
 {
@@ -1057,7 +1056,7 @@ _ecordova_contactorganizations_import(Eina_Array *organizations,
    ret = contacts_record_get_child_record_count(contacts_record,
                                                 _contacts_contact.company,
                                                 &count);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    DBG("Importing %d organizations", count);
    for (int index = 0; index < count; ++index)
@@ -1067,28 +1066,28 @@ _ecordova_contactorganizations_import(Eina_Array *organizations,
                                                     _contacts_contact.company,
                                                     index,
                                                     &child_record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
         Ecordova_ContactOrganization *organization = eo_add(ECORDOVA_CONTACTORGANIZATION_CLASS, NULL);
         if (!ecordova_contactorganization_import(organization, child_record))
           {
              eo_unref(organization);
-             return false;
+             return EINA_FALSE;
           }
 
         Eina_Bool ret = eina_array_push(organizations, organization);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EINA_FALSE);
      }
 
-   return true;
+   return EINA_TRUE;
 }
 
-static bool
+static Eina_Bool
 _ecordova_contactorganizations_export(Eina_Array *organizations,
                                       contacts_record_h contacts_record)
 {
    if (!clear_all_contact_record(contacts_record, _contacts_contact.company))
-     return false;
+     return EINA_FALSE;
 
    Ecordova_ContactOrganization *organization;
    Eina_Array_Iterator iterator;
@@ -1097,22 +1096,22 @@ _ecordova_contactorganizations_export(Eina_Array *organizations,
      {
         contacts_record_h record = NULL;
         int ret = contacts_record_create(_contacts_company._uri, &record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
         if (!ecordova_contactaddress_export(organization, record))
           {
-             ret = contacts_record_destroy(record, true);
-             EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
-             return false;
+             ret = contacts_record_destroy(record, EINA_TRUE);
+             EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
+             return EINA_FALSE;
           }
 
         ret = contacts_record_add_child_record(contacts_record,
                                                _contacts_contact.company,
                                                record);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
      }
 
-   return true;
+   return EINA_TRUE;
 }
 
 #include "ecordova_contact.eo.c"
diff --git a/src/modules/ecordova/tizen/ecordova_contact_private.h b/src/modules/ecordova/tizen/ecordova_contact_private.h
index 4a1ddc8deb..5b0f9b5ce5 100644
--- a/src/modules/ecordova/tizen/ecordova_contact_private.h
+++ b/src/modules/ecordova/tizen/ecordova_contact_private.h
@@ -9,7 +9,6 @@
 #include "ecordova_contact.eo.h"
 
 #include <contacts.h>
-#include <stdbool.h>
 
 typedef struct _Ecordova_Contact_Data Ecordova_Contact_Data;
 
@@ -32,7 +31,7 @@ struct _Ecordova_Contact_Data
    Eina_Array           *urls;
 };
 
-bool ecordova_contact_import(Ecordova_Contact *, contacts_record_h);
-bool ecordova_contact_export(Ecordova_Contact *, contacts_record_h);
+Eina_Bool ecordova_contact_import(Ecordova_Contact *, contacts_record_h);
+Eina_Bool ecordova_contact_export(Ecordova_Contact *, contacts_record_h);
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_contactaddress.c b/src/modules/ecordova/tizen/ecordova_contactaddress.c
index 2aa209f24f..704bcab514 100644
--- a/src/modules/ecordova/tizen/ecordova_contactaddress.c
+++ b/src/modules/ecordova/tizen/ecordova_contactaddress.c
@@ -7,7 +7,6 @@
 #include "ecordova_contactaddress_private.h"
 #include "ecordova_contacts_record_utils.h"
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -30,36 +29,12 @@ _ecordova_contactaddress_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_contactaddress_constructor(Eo *obj,
-                                     Ecordova_ContactAddress_Data *pd EINA_UNUSED,
-                                     Eina_Bool pref,
-                                     const char *type,
-                                     const char *formatted,
-                                     const char *street_address,
-                                     const char *locality,
-                                     const char *region,
-                                     const char *postal_code,
-                                     const char *country)
-{
-   DBG("(%p)", obj);
-   eo_do(obj,
-         ecordova_contactaddress_pref_set(pref),
-         ecordova_contactaddress_type_set(type),
-         ecordova_contactaddress_formatted_set(formatted),
-         ecordova_contactaddress_street_address_set(street_address),
-         ecordova_contactaddress_locality_set(locality),
-         ecordova_contactaddress_region_set(region),
-         ecordova_contactaddress_postal_code_set(postal_code),
-         ecordova_contactaddress_country_set(country));
-}
-
-static void
 _ecordova_contactaddress_eo_base_destructor(Eo *obj,
                                             Ecordova_ContactAddress_Data *pd)
 {
    DBG("(%p)", obj);
 
-   int ret = contacts_record_destroy(pd->record, true);
+   int ret = contacts_record_destroy(pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 
    eo_do_super(obj, MY_CLASS, eo_destructor());
@@ -253,44 +228,44 @@ _ecordova_contactaddress_country_set(Eo *obj EINA_UNUSED,
    set_str(pd->record, _contacts_address.country, value);
 }
 
-bool
+Eina_Bool
 ecordova_contactaddress_import(Ecordova_ContactAddress *obj,
                                contacts_record_h child_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(child_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(child_record, EINA_FALSE);
 
    Ecordova_ContactAddress_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTADDRESS_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
-   int ret = contacts_record_destroy(pd->record, true);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   int ret = contacts_record_destroy(pd->record, EINA_TRUE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    ret = contacts_record_clone(child_record, &pd->record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    return get_int(child_record, _contacts_address.id, &pd->id);
 }
 
-bool
+Eina_Bool
 ecordova_contactaddress_export(Ecordova_ContactAddress *obj,
                                contacts_record_h contacts_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    Ecordova_ContactAddress_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTADDRESS_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    contacts_record_h child_record = NULL;
    int ret = contacts_record_clone(pd->record, &child_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    ret = contacts_record_add_child_record(contacts_record,
                                           _contacts_contact.address,
                                           child_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
 Ecordova_ContactAddress *
@@ -303,7 +278,7 @@ ecordova_contactaddress_clone(Ecordova_ContactAddress *other)
    Ecordova_ContactAddress_Data *other_pd = eo_data_scope_get(other, ECORDOVA_CONTACTADDRESS_CLASS);
    EINA_SAFETY_ON_NULL_RETURN_VAL(other_pd, NULL);
 
-   int ret = contacts_record_destroy(cloned_pd->record, true);
+   int ret = contacts_record_destroy(cloned_pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
    ret = contacts_record_clone(other_pd->record, &cloned_pd->record);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
diff --git a/src/modules/ecordova/tizen/ecordova_contactaddress_private.h b/src/modules/ecordova/tizen/ecordova_contactaddress_private.h
index 56715d34f1..87b0449568 100644
--- a/src/modules/ecordova/tizen/ecordova_contactaddress_private.h
+++ b/src/modules/ecordova/tizen/ecordova_contactaddress_private.h
@@ -18,8 +18,8 @@ struct _Ecordova_ContactAddress_Data
    contacts_record_h  record;
 };
 
-bool ecordova_contactaddress_import(Ecordova_ContactAddress *, contacts_record_h);
-bool ecordova_contactaddress_export(Ecordova_ContactAddress *, contacts_record_h);
+Eina_Bool ecordova_contactaddress_import(Ecordova_ContactAddress *, contacts_record_h);
+Eina_Bool ecordova_contactaddress_export(Ecordova_ContactAddress *, contacts_record_h);
 Ecordova_ContactAddress *ecordova_contactaddress_clone(Ecordova_ContactAddress *);
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_contactfield.c b/src/modules/ecordova/tizen/ecordova_contactfield.c
index f69978cc13..4d49fae416 100644
--- a/src/modules/ecordova/tizen/ecordova_contactfield.c
+++ b/src/modules/ecordova/tizen/ecordova_contactfield.c
@@ -6,7 +6,6 @@
 #include "ecordova_contactfield_private.h"
 #include "ecordova_contacts_record_utils.h"
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -20,25 +19,15 @@ _ecordova_contactfield_eo_base_constructor(Eo *obj,
    DBG("(%p)", obj);
 
    pd->obj = obj;
+   pd->id = 0;
+   pd->type = NULL;
+   pd->value = NULL;
+   pd->pref = EINA_FALSE;
 
    return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
 }
 
 static void
-_ecordova_contactfield_constructor(Eo *obj,
-                                  Ecordova_ContactField_Data *pd,
-                                  const char *type,
-                                  const char *value,
-                                  Eina_Bool pref)
-{
-   DBG("(%p)", obj);
-   pd->id = 0;
-   pd->type = type ? strdup(type) : NULL;
-   pd->value = value ? strdup(value) : NULL;
-   pd->pref = pref;
-}
-
-static void
 _ecordova_contactfield_eo_base_destructor(Eo *obj,
                                           Ecordova_ContactField_Data *pd)
 {
@@ -104,17 +93,17 @@ _ecordova_contactfield_pref_set(Eo *obj EINA_UNUSED,
    pd->pref = pref;
 }
 
-bool
+Eina_Bool
 ecordova_contactfield_import(Ecordova_ContactField *obj,
                              contacts_record_h record,
                              const Ecordova_ContactField_Metadata metadata)
 {
    DBG("%p", obj);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    Ecordova_ContactField_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTFIELD_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    int type = 0;
    const char* label = NULL;
@@ -124,7 +113,7 @@ ecordova_contactfield_import(Ecordova_ContactField *obj,
        !get_str_p(record,
                   *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_LABEL],
                   &label))
-     return false;
+     return EINA_FALSE;
 
    pd->type = metadata.type2label(type, label);
 
@@ -134,52 +123,52 @@ ecordova_contactfield_import(Ecordova_ContactField *obj,
        !get_str(record,
                 *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_VALUE],
                 &pd->value))
-     return false;
+     return EINA_FALSE;
 
    if (metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_PREF] &&
        !get_bool(record,
                  *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_PREF],
                  &pd->pref))
-     return false;
+     return EINA_FALSE;
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 ecordova_contactfield_export(Ecordova_ContactField *obj,
                              contacts_record_h record,
                              const Ecordova_ContactField_Metadata metadata)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    Ecordova_ContactField_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTFIELD_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    int type = metadata.label2type(pd->type);
    if (!set_int(record,
                 *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_TYPE],
                 type))
-     return false;
+     return EINA_FALSE;
 
    if (pd->type &&
        !set_str(record,
                 *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_LABEL],
                 pd->type))
-     return false;
+     return EINA_FALSE;
 
    if (!set_str(record,
                 *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_VALUE],
                 pd->value))
-     return false;
+     return EINA_FALSE;
 
    if (metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_PREF] &&
        !set_bool(record,
                  *metadata.ids[ECORDOVA_CONTACTFIELD_PROPERTY_PREF],
                  pd->pref))
-     return false;
+     return EINA_FALSE;
 
-   return true;
+   return EINA_TRUE;
 }
 
 char *
diff --git a/src/modules/ecordova/tizen/ecordova_contactfield_private.h b/src/modules/ecordova/tizen/ecordova_contactfield_private.h
index 408a40addc..b69b2cf6f2 100644
--- a/src/modules/ecordova/tizen/ecordova_contactfield_private.h
+++ b/src/modules/ecordova/tizen/ecordova_contactfield_private.h
@@ -5,7 +5,6 @@
 #include "ecordova_contactfield.eo.h"
 
 #include <contacts.h>
-#include <stdbool.h>
 
 typedef enum _Ecordova_ContactField_Property
 {
@@ -41,8 +40,8 @@ struct _Ecordova_ContactField_Data
    Ecordova_ContactField_Metadata  metadata;
 };
 
-bool ecordova_contactfield_import(Ecordova_ContactField *, contacts_record_h, const Ecordova_ContactField_Metadata);
-bool ecordova_contactfield_export(Ecordova_ContactField *, contacts_record_h, const Ecordova_ContactField_Metadata);
+Eina_Bool ecordova_contactfield_import(Ecordova_ContactField *, contacts_record_h, const Ecordova_ContactField_Metadata);
+Eina_Bool ecordova_contactfield_export(Ecordova_ContactField *, contacts_record_h, const Ecordova_ContactField_Metadata);
 
 char *ecordova_contactnumber_type2label(int, const char *);
 int ecordova_contactnumber_label2type(const char *);
diff --git a/src/modules/ecordova/tizen/ecordova_contactname.c b/src/modules/ecordova/tizen/ecordova_contactname.c
index 655cee87a0..d44d0d0bb5 100644
--- a/src/modules/ecordova/tizen/ecordova_contactname.c
+++ b/src/modules/ecordova/tizen/ecordova_contactname.c
@@ -8,7 +8,6 @@
 #include "ecordova_contacts_record_utils.h"
 #include "ecordova_contactname.eo.h"
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -23,6 +22,7 @@ _ecordova_contactname_eo_base_constructor(Eo *obj,
 
    pd->obj = obj;
    pd->record = NULL;
+     
    int ret = contacts_record_create(_contacts_name._uri, &pd->record);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
 
@@ -30,31 +30,11 @@ _ecordova_contactname_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_contactname_constructor(Eo *obj,
-                                  Ecordova_ContactName_Data *pd EINA_UNUSED,
-                                  const char *formatted,
-                                  const char *family_name,
-                                  const char *given_name,
-                                  const char *middle,
-                                  const char *prefix,
-                                  const char *suffix)
-{
-   DBG("(%p)", obj);
-   eo_do(obj,
-         ecordova_contactname_formatted_set(formatted),
-         ecordova_contactname_family_name_set(family_name),
-         ecordova_contactname_given_name_set(given_name),
-         ecordova_contactname_middle_set(middle),
-         ecordova_contactname_prefix_set(prefix),
-         ecordova_contactname_suffix_set(suffix));
-}
-
-static void
 _ecordova_contactname_eo_base_destructor(Eo *obj, Ecordova_ContactName_Data *pd)
 {
    DBG("(%p)", obj);
 
-   int ret = contacts_record_destroy(pd->record, true);
+   int ret = contacts_record_destroy(pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 
    eo_do_super(obj, MY_CLASS, eo_destructor());
@@ -176,15 +156,15 @@ _ecordova_contactname_suffix_set(Eo *obj EINA_UNUSED,
    set_str(pd->record, _contacts_name.suffix, value);
 }
 
-bool
+Eina_Bool
 ecordova_contactname_import(Ecordova_ContactName *obj,
                             contacts_record_h contacts_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    Ecordova_ContactName_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTNAME_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    int ret;
 
@@ -192,48 +172,48 @@ ecordova_contactname_import(Ecordova_ContactName *obj,
    ret = contacts_record_get_child_record_count(contacts_record,
                                                 _contacts_contact.name,
                                                 &count);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(count == 1, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(count == 1, EINA_FALSE);
 
    contacts_record_h contactname_record = NULL;
    ret = contacts_record_get_child_record_at_p(contacts_record,
                                                _contacts_contact.name,
                                                0,
                                                &contactname_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   ret = contacts_record_destroy(pd->record, true);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   ret = contacts_record_destroy(pd->record, EINA_TRUE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    ret = contacts_record_clone(contactname_record, &pd->record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    // TODO: check display name
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 ecordova_contactname_export(Ecordova_ContactName *obj,
                             contacts_record_h contacts_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    Ecordova_ContactName_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTNAME_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    contacts_record_h contactname_record = NULL;
    int ret = contacts_record_clone(pd->record, &contactname_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    ret = contacts_record_add_child_record(contacts_record,
                                           _contacts_contact.name,
                                           contactname_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    // TODO: check display name
 
-   return true;
+   return EINA_TRUE;
 }
 
 Ecordova_ContactName *
@@ -246,7 +226,7 @@ ecordova_contactname_clone(Ecordova_ContactName *other)
    Ecordova_ContactName_Data *other_pd = eo_data_scope_get(other, ECORDOVA_CONTACTNAME_CLASS);
    EINA_SAFETY_ON_NULL_RETURN_VAL(other_pd, NULL);
 
-   int ret = contacts_record_destroy(cloned_pd->record, true);
+   int ret = contacts_record_destroy(cloned_pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
    ret = contacts_record_clone(other_pd->record, &cloned_pd->record);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
diff --git a/src/modules/ecordova/tizen/ecordova_contactname_private.h b/src/modules/ecordova/tizen/ecordova_contactname_private.h
index ccdcd61cb8..6c11f9a223 100644
--- a/src/modules/ecordova/tizen/ecordova_contactname_private.h
+++ b/src/modules/ecordova/tizen/ecordova_contactname_private.h
@@ -5,7 +5,6 @@
 #include "ecordova_contactname.eo.h"
 
 #include <contacts.h>
-#include <stdbool.h>
 
 typedef struct _Ecordova_ContactName_Data Ecordova_ContactName_Data;
 
@@ -18,8 +17,8 @@ struct _Ecordova_ContactName_Data
    contacts_record_h  record;
 };
 
-bool ecordova_contactname_import(Ecordova_ContactName *, contacts_record_h);
-bool ecordova_contactname_export(Ecordova_ContactName *, contacts_record_h);
+Eina_Bool ecordova_contactname_import(Ecordova_ContactName *, contacts_record_h);
+Eina_Bool ecordova_contactname_export(Ecordova_ContactName *, contacts_record_h);
 Ecordova_ContactName *ecordova_contactname_clone(Ecordova_ContactName *);
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_contactorganization.c b/src/modules/ecordova/tizen/ecordova_contactorganization.c
index b6df0db035..e981cb920f 100644
--- a/src/modules/ecordova/tizen/ecordova_contactorganization.c
+++ b/src/modules/ecordova/tizen/ecordova_contactorganization.c
@@ -6,7 +6,6 @@
 #include "ecordova_contactorganization_private.h"
 #include "ecordova_contacts_record_utils.h"
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -29,29 +28,12 @@ _ecordova_contactorganization_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_contactorganization_constructor(Eo *obj,
-                                          Ecordova_ContactOrganization_Data *pd EINA_UNUSED,
-                                          Eina_Bool pref EINA_UNUSED,
-                                          const char *type,
-                                          const char *name,
-                                          const char *dept,
-                                          const char *title)
-{
-   DBG("(%p)", obj);
-   eo_do(obj,
-         ecordova_contactorganization_type_set(type),
-         ecordova_contactorganization_name_set(name),
-         ecordova_contactorganization_dept_set(dept),
-         ecordova_contactorganization_title_set(title));
-}
-
-static void
 _ecordova_contactorganization_eo_base_destructor(Eo *obj,
                                                  Ecordova_ContactOrganization_Data *pd)
 {
    DBG("(%p)", obj);
 
-   int ret = contacts_record_destroy(pd->record, true);
+   int ret = contacts_record_destroy(pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 
    eo_do_super(obj, MY_CLASS, eo_destructor());
@@ -172,44 +154,44 @@ _ecordova_contactorganization_title_set(Eo *obj EINA_UNUSED,
    set_str(pd->record, _contacts_company.job_title, value);
 }
 
-bool
+Eina_Bool
 ecordova_contactorganization_import(Ecordova_ContactOrganization *obj,
                                     contacts_record_h child_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(child_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(child_record, EINA_FALSE);
 
    Ecordova_ContactOrganization_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTORGANIZATION_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
-   int ret = contacts_record_destroy(pd->record, true);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   int ret = contacts_record_destroy(pd->record, EINA_TRUE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    ret = contacts_record_clone(child_record, &pd->record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    return get_int(child_record, _contacts_company.id, &pd->id);
 }
 
-bool
+Eina_Bool
 ecordova_contactorganization_export(Ecordova_ContactOrganization *obj,
                                     contacts_record_h contacts_record)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, false);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    Ecordova_ContactOrganization_Data *pd = eo_data_scope_get(obj, ECORDOVA_CONTACTORGANIZATION_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE);
 
    contacts_record_h child_record = NULL;
    int ret = contacts_record_clone(pd->record, &child_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    ret = contacts_record_add_child_record(contacts_record,
                                           _contacts_contact.company,
                                           child_record);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
 Ecordova_ContactOrganization *
@@ -222,7 +204,7 @@ ecordova_contactorganization_clone(Ecordova_ContactOrganization *other)
    Ecordova_ContactOrganization_Data *other_pd = eo_data_scope_get(other, ECORDOVA_CONTACTORGANIZATION_CLASS);
    EINA_SAFETY_ON_NULL_RETURN_VAL(other_pd, NULL);
 
-   int ret = contacts_record_destroy(cloned_pd->record, true);
+   int ret = contacts_record_destroy(cloned_pd->record, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
    ret = contacts_record_clone(other_pd->record, &cloned_pd->record);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, NULL);
diff --git a/src/modules/ecordova/tizen/ecordova_contactorganization_private.h b/src/modules/ecordova/tizen/ecordova_contactorganization_private.h
index 643b11792d..ac9381b58b 100644
--- a/src/modules/ecordova/tizen/ecordova_contactorganization_private.h
+++ b/src/modules/ecordova/tizen/ecordova_contactorganization_private.h
@@ -18,8 +18,8 @@ struct _Ecordova_ContactOrganization_Data
    contacts_record_h  record;
 };
 
-bool ecordova_contactorganization_import(Ecordova_ContactOrganization *, contacts_record_h);
-bool ecordova_contactorganization_export(Ecordova_ContactOrganization *, contacts_record_h);
+Eina_Bool ecordova_contactorganization_import(Ecordova_ContactOrganization *, contacts_record_h);
+Eina_Bool ecordova_contactorganization_export(Ecordova_ContactOrganization *, contacts_record_h);
 Ecordova_ContactOrganization *ecordova_contactorganization_clone(Ecordova_ContactOrganization *);
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_contacts.c b/src/modules/ecordova/tizen/ecordova_contacts.c
index 845907b880..0d1d24510b 100644
--- a/src/modules/ecordova/tizen/ecordova_contacts.c
+++ b/src/modules/ecordova/tizen/ecordova_contacts.c
@@ -9,7 +9,6 @@
 
 #include <contacts.h>
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -34,8 +33,8 @@ typedef enum Contacts_Search_Id {
 
 static contacts_filter_h _filter_get(contacts_filter_h *, const char *);
 static contacts_list_h _get_records(const Eina_List *, const Ecordova_Contacts_FindOptions *);
-static bool _search_records(contacts_filter_h, const char *, contacts_list_h *, Eina_Bool);
-static bool _populate_list(contacts_list_h, Eina_Hash *, contacts_filter_h, const char *, int, Eina_Bool);
+static Eina_Bool _search_records(contacts_filter_h, const char *, contacts_list_h *, Eina_Bool);
+static Eina_Bool _populate_list(contacts_list_h, Eina_Hash *, contacts_filter_h, const char *, int, Eina_Bool);
 
 static Eo_Base *
 _ecordova_contacts_eo_base_constructor(Eo *obj, Ecordova_Contacts_Data *pd)
@@ -48,13 +47,6 @@ _ecordova_contacts_eo_base_constructor(Eo *obj, Ecordova_Contacts_Data *pd)
 }
 
 static void
-_ecordova_contacts_constructor(Eo *obj EINA_UNUSED,
-                               Ecordova_Contacts_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_contacts_eo_base_destructor(Eo *obj,
                                       Ecordova_Contacts_Data *pd EINA_UNUSED)
 {
@@ -154,7 +146,7 @@ _ecordova_contacts_find(Eo *obj,
      eo_unref(contact);
    eina_array_free(contacts);
 
-   ret = contacts_list_destroy(list, true);
+   ret = contacts_list_destroy(list, EINA_TRUE);
    EINA_SAFETY_ON_FALSE_RETURN(CONTACTS_ERROR_NONE == ret);
 }
 
@@ -371,7 +363,7 @@ _get_records(const Eina_List *fields,
                }
 
              int id;
-             bool ok = get_int(record, _contacts_contact.id, &id);
+             Eina_Bool ok = get_int(record, _contacts_contact.id, &id);
              EINA_SAFETY_ON_FALSE_GOTO(ok, on_error_2);
 
              ok = eina_hash_add(contact_ids, &id, &id) == EINA_TRUE;
@@ -418,7 +410,7 @@ on_error_1:
    return list;
 }
 
-static bool
+static Eina_Bool
 _search_records(contacts_filter_h filter,
                 const char *uri,
                 contacts_list_h *list,
@@ -428,7 +420,7 @@ _search_records(contacts_filter_h filter,
    contacts_query_h query = NULL;
 
    ret = contacts_query_create(uri, &query);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    ret = contacts_query_set_filter(query, filter);
    EINA_SAFETY_ON_FALSE_GOTO(CONTACTS_ERROR_NONE == ret, on_error_1);
@@ -438,20 +430,20 @@ _search_records(contacts_filter_h filter,
 
    ret = contacts_query_destroy(query);
    EINA_SAFETY_ON_FALSE_GOTO(CONTACTS_ERROR_NONE == ret, on_error_2);
-   return true;
+   return EINA_TRUE;
 
 on_error_2:
-   ret = contacts_list_destroy(*list, true);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   ret = contacts_list_destroy(*list, EINA_TRUE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    *list = NULL;
 
 on_error_1:
    ret = contacts_query_destroy(query);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
-   return false;
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
+   return EINA_FALSE;
 }
 
-static bool
+static Eina_Bool
 _populate_list(contacts_list_h list,
                Eina_Hash *contact_ids,
                contacts_filter_h filter,
@@ -461,7 +453,7 @@ _populate_list(contacts_list_h list,
 {
    contacts_list_h sub_list = NULL;
    if (!_search_records(filter, uri, &sub_list, multiple))
-     return false;
+     return EINA_FALSE;
 
    unsigned int contact_id[SEARCH_ID_COUNT] = {
      [SEARCH_CONTACT]   = _contacts_contact.id,
@@ -479,7 +471,7 @@ _populate_list(contacts_list_h list,
    };
 
    int ret;
-   bool result = true;
+   Eina_Bool result = EINA_TRUE;
    do
      {
         contacts_record_h record = NULL;
@@ -512,8 +504,8 @@ _populate_list(contacts_list_h list,
      } while (multiple && contacts_list_next(sub_list) == CONTACTS_ERROR_NONE);
 
 on_error:
-   ret = contacts_list_destroy(sub_list, true);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   ret = contacts_list_destroy(sub_list, EINA_TRUE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    return result;
 }
 
diff --git a/src/modules/ecordova/tizen/ecordova_contacts_record_utils.c b/src/modules/ecordova/tizen/ecordova_contacts_record_utils.c
index b813779840..98fb688221 100644
--- a/src/modules/ecordova/tizen/ecordova_contacts_record_utils.c
+++ b/src/modules/ecordova/tizen/ecordova_contacts_record_utils.c
@@ -7,90 +7,90 @@
 
 #include <Eina.h>
 
-bool
+Eina_Bool
 get_str(contacts_record_h record, unsigned int property_id, char **value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    int ret = contacts_record_get_str(record, property_id, value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 get_str_p(contacts_record_h record, unsigned int property_id, const char **value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    int ret = contacts_record_get_str_p(record, property_id, (char**)value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 set_str(contacts_record_h record, unsigned int property_id, const char *value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    int ret = contacts_record_set_str(record, property_id, value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 get_int(contacts_record_h record, unsigned int property_id, int *value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    int ret = contacts_record_get_int(record, property_id, value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 set_int(contacts_record_h record, unsigned int property_id, int value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
    int ret = contacts_record_set_int(record, property_id, value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 get_bool(contacts_record_h record, unsigned int property_id, Eina_Bool *value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
-   bool raw_value;
+   Eina_Bool raw_value;
    int ret = contacts_record_get_bool(record, property_id, &raw_value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
    *value = raw_value ? EINA_TRUE : EINA_FALSE;
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 set_bool(contacts_record_h record, unsigned int property_id, Eina_Bool value)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(record, EINA_FALSE);
 
-   int ret = contacts_record_set_bool(record, property_id, (bool)value);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+   int ret = contacts_record_set_bool(record, property_id, value);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-   return true;
+   return EINA_TRUE;
 }
 
-bool
+Eina_Bool
 clear_all_contact_record(contacts_record_h contacts_record,
                          unsigned int property_id)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, false);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(contacts_record, EINA_FALSE);
 
    int ret;
    int count = 0;
@@ -98,7 +98,7 @@ clear_all_contact_record(contacts_record_h contacts_record,
                                                 property_id,
                                                 &count);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret ||
-                                   CONTACTS_ERROR_NO_DATA == ret, false);
+                                   CONTACTS_ERROR_NO_DATA == ret, EINA_FALSE);
 
    for (int index = count - 1; index >= 0; --index)
    {
@@ -107,17 +107,17 @@ clear_all_contact_record(contacts_record_h contacts_record,
                                                   property_id,
                                                   index,
                                                   &child_record);
-      EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+      EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
       ret = contacts_record_remove_child_record(contacts_record,
                                                 property_id,
                                                 child_record);
-      EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+      EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
 
-      ret = contacts_record_destroy(child_record, true);
-      EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, false);
+      ret = contacts_record_destroy(child_record, EINA_TRUE);
+      EINA_SAFETY_ON_FALSE_RETURN_VAL(CONTACTS_ERROR_NONE == ret, EINA_FALSE);
    }
 
-   return true;
+   return EINA_TRUE;
 }
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_contacts_record_utils.h b/src/modules/ecordova/tizen/ecordova_contacts_record_utils.h
index 9e9aa2d55e..9cdeec8892 100644
--- a/src/modules/ecordova/tizen/ecordova_contacts_record_utils.h
+++ b/src/modules/ecordova/tizen/ecordova_contacts_record_utils.h
@@ -3,18 +3,17 @@
 
 #include <Eina.h>
 #include <contacts.h>
-#include <stdbool.h>
 
-bool get_str(contacts_record_h, unsigned int, char **);
-bool get_str_p(contacts_record_h, unsigned int, const char **);
-bool set_str(contacts_record_h, unsigned int, const char *);
+Eina_Bool get_str(contacts_record_h, unsigned int, char **);
+Eina_Bool get_str_p(contacts_record_h, unsigned int, const char **);
+Eina_Bool set_str(contacts_record_h, unsigned int, const char *);
 
-bool get_int(contacts_record_h, unsigned int, int *);
-bool set_int(contacts_record_h, unsigned int, int);
+Eina_Bool get_int(contacts_record_h, unsigned int, int *);
+Eina_Bool set_int(contacts_record_h, unsigned int, int);
 
-bool get_bool(contacts_record_h, unsigned int, Eina_Bool *);
-bool set_bool(contacts_record_h, unsigned int, Eina_Bool);
+Eina_Bool get_bool(contacts_record_h, unsigned int, Eina_Bool *);
+Eina_Bool set_bool(contacts_record_h, unsigned int, Eina_Bool);
 
-bool clear_all_contact_record(contacts_record_h, unsigned int);
+Eina_Bool clear_all_contact_record(contacts_record_h, unsigned int);
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_device.c b/src/modules/ecordova/tizen/ecordova_device.c
index 0b2d166381..f60a9aa5ac 100644
--- a/src/modules/ecordova/tizen/ecordova_device.c
+++ b/src/modules/ecordova/tizen/ecordova_device.c
@@ -25,13 +25,6 @@ _ecordova_device_eo_base_constructor(Eo *obj, Ecordova_Device_Data *pd)
 }
 
 static void
-_ecordova_device_constructor(Eo *obj EINA_UNUSED,
-                             Ecordova_Device_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_device_eo_base_destructor(Eo *obj, Ecordova_Device_Data *pd)
 {
    DBG("(%p)", obj);
diff --git a/src/modules/ecordova/tizen/ecordova_devicemotion.c b/src/modules/ecordova/tizen/ecordova_devicemotion.c
index 381611994a..a5344c04b6 100644
--- a/src/modules/ecordova/tizen/ecordova_devicemotion.c
+++ b/src/modules/ecordova/tizen/ecordova_devicemotion.c
@@ -26,13 +26,6 @@ _ecordova_devicemotion_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_devicemotion_constructor(Eo *obj EINA_UNUSED,
-                                   Ecordova_DeviceMotion_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_devicemotion_eo_base_destructor(Eo *obj,
                                           Ecordova_DeviceMotion_Data *pd)
 {
diff --git a/src/modules/ecordova/tizen/ecordova_deviceorientation.c b/src/modules/ecordova/tizen/ecordova_deviceorientation.c
index a98ae23cfb..b3592f2589 100644
--- a/src/modules/ecordova/tizen/ecordova_deviceorientation.c
+++ b/src/modules/ecordova/tizen/ecordova_deviceorientation.c
@@ -26,13 +26,6 @@ _ecordova_deviceorientation_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_deviceorientation_constructor(Eo *obj EINA_UNUSED,
-                                        Ecordova_DeviceOrientation_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_deviceorientation_eo_base_destructor(Eo *obj,
                                                Ecordova_DeviceOrientation_Data *pd)
 {
diff --git a/src/modules/ecordova/tizen/ecordova_geolocation.c b/src/modules/ecordova/tizen/ecordova_geolocation.c
index e6303d1003..d56b0b75da 100644
--- a/src/modules/ecordova/tizen/ecordova_geolocation.c
+++ b/src/modules/ecordova/tizen/ecordova_geolocation.c
@@ -14,15 +14,15 @@ typedef struct
   Eo                           *obj;
   location_manager_h            manager;
   Ecore_Timer                  *timer;
-  bool                          current;
-  bool                          is_ready;
+  Eina_Bool                          current;
+  Eina_Bool                          is_ready;
 } Ecordova_Geolocation_Watch;
 
 static void _watch_free(Ecordova_Geolocation_Watch*);
 static Eina_Bool _interval_cb(void *);
 static void _state_changed_cb(location_service_state_e, void *);
 static void _notify(Ecordova_Geolocation_Watch *);
-static Ecordova_Geolocation_Watch *_create_watch(Eo *, const Ecordova_Geolocation_Options *, bool);
+static Ecordova_Geolocation_Watch *_create_watch(Eo *, const Ecordova_Geolocation_Options *, Eina_Bool);
 
 static Eo_Base *
 _ecordova_geolocation_eo_base_constructor(Eo *obj,
@@ -59,7 +59,7 @@ _ecordova_geolocation_current_position_get(Eo *obj,
                                            Ecordova_Geolocation_Data *pd EINA_UNUSED,
                                            const Ecordova_Geolocation_Options *options)
 {
-   Ecordova_Geolocation_Watch *watch = _create_watch(obj, options, true);
+   Ecordova_Geolocation_Watch *watch = _create_watch(obj, options, EINA_TRUE);
    if (!watch)
      {
         Ecordova_Geolocation_Error error = {
@@ -77,7 +77,7 @@ _ecordova_geolocation_position_watch(Eo *obj,
                                      Ecordova_Geolocation_Data *pd,
                                      const Ecordova_Geolocation_Options *options)
 {
-   Ecordova_Geolocation_Watch *watch = _create_watch(obj, options, false);
+   Ecordova_Geolocation_Watch *watch = _create_watch(obj, options, EINA_FALSE);
    if (!watch)
      {
         Ecordova_Geolocation_Error error = {
@@ -161,7 +161,7 @@ _state_changed_cb(location_service_state_e state, void *data)
      return;
 
    Ecordova_Geolocation_Watch *watch = data;
-   watch->is_ready = true;
+   watch->is_ready = EINA_TRUE;
 
    if (watch->current)
      {
@@ -236,7 +236,7 @@ _notify(Ecordova_Geolocation_Watch* watch)
 static Ecordova_Geolocation_Watch *
 _create_watch(Eo *obj,
               const Ecordova_Geolocation_Options *options,
-              bool is_current)
+              Eina_Bool is_current)
 {
    const Ecordova_Geolocation_Options default_options = {
      .enable_high_accuracy = EINA_FALSE,
diff --git a/src/modules/ecordova/tizen/ecordova_globalization.c b/src/modules/ecordova/tizen/ecordova_globalization.c
index 8501794dc7..5369cda521 100644
--- a/src/modules/ecordova/tizen/ecordova_globalization.c
+++ b/src/modules/ecordova/tizen/ecordova_globalization.c
@@ -25,13 +25,6 @@ _ecordova_globalization_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_globalization_constructor(Eo *obj EINA_UNUSED,
-                                    Ecordova_Globalization_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_globalization_eo_base_destructor(Eo *obj,
                                            Ecordova_Globalization_Data *pd EINA_UNUSED)
 {
diff --git a/src/modules/ecordova/tizen/ecordova_media.c b/src/modules/ecordova/tizen/ecordova_media.c
index 4fef7d10ae..539a21175e 100644
--- a/src/modules/ecordova/tizen/ecordova_media.c
+++ b/src/modules/ecordova/tizen/ecordova_media.c
@@ -28,7 +28,7 @@ static void _set_position_action(Ecordova_Media_Data *, void *);
 static void _set_volume_action(Ecordova_Media_Data *, void *);
 static void _update_status(Ecordova_Media_Data *);
 static void _release(Ecordova_Media_Data *);
-static void _state_changed_cb(recorder_state_e, recorder_state_e, bool, void *);
+static void _state_changed_cb(recorder_state_e, recorder_state_e, Eina_Bool, void *);
 static void _start_record(Ecordova_Media_Data *);
 
 static Eo_Base *
@@ -41,15 +41,15 @@ _ecordova_media_eo_base_constructor(Eo *obj, Ecordova_Media_Data *pd)
    pd->recorder = NULL;
    pd->status = ECORDOVA_MEDIA_STATUS_MEDIA_NONE;
    pd->pending = NULL;
-   pd->record_pending = false;
+   pd->record_pending = EINA_FALSE;
 
    return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
 }
 
 static void
-_ecordova_media_constructor(Eo *obj,
-                            Ecordova_Media_Data *pd,
-                            const char *src)
+_ecordova_media_uri_set(Eo *obj,
+                        Ecordova_Media_Data *pd,
+                        const char *src)
 {
    DBG("(%p)", obj);
    EINA_SAFETY_ON_NULL_RETURN(src);
@@ -221,7 +221,7 @@ _ecordova_media_record_start(Eo *obj, Ecordova_Media_Data *pd)
       case RECORDER_STATE_CREATED:
         ret = recorder_prepare(pd->recorder);
         EINA_SAFETY_ON_FALSE_RETURN(RECORDER_ERROR_NONE == ret);
-        pd->record_pending = true;
+        pd->record_pending = EINA_TRUE;
         return;
       case RECORDER_STATE_READY:
         if (pd->record_pending)
@@ -415,7 +415,7 @@ _set_position_action(Ecordova_Media_Data *pd, void *data)
    int *position = data;
    int ret = player_set_play_position(pd->player,
                                       *position,
-                                      false,
+                                      EINA_FALSE,
                                       _set_position_cb,
                                       pd);
    free(position);
@@ -504,7 +504,7 @@ _release(Ecordova_Media_Data *pd)
 static void
 _state_changed_cb(recorder_state_e previous,
                   recorder_state_e current,
-                  bool by_policy EINA_UNUSED,
+                  Eina_Bool by_policy EINA_UNUSED,
                   void *data)
 {
    Ecordova_Media_Data *pd = data;
@@ -515,7 +515,7 @@ _state_changed_cb(recorder_state_e previous,
      }
 
    if (RECORDER_STATE_RECORDING == current)
-     pd->record_pending = false;
+     pd->record_pending = EINA_FALSE;
 
    // TODO: Check what thread this callback is running to make sure it's on the main thread
    if (RECORDER_STATE_RECORDING == previous && RECORDER_STATE_READY == current)
diff --git a/src/modules/ecordova/tizen/ecordova_media_private.h b/src/modules/ecordova/tizen/ecordova_media_private.h
index 84d7dbe9ec..d40b457c5e 100644
--- a/src/modules/ecordova/tizen/ecordova_media_private.h
+++ b/src/modules/ecordova/tizen/ecordova_media_private.h
@@ -6,7 +6,6 @@
 #include <player.h>
 #include <recorder.h>
 
-#include <stdbool.h>
 
 typedef struct _Ecordova_Media_Data Ecordova_Media_Data;
 
@@ -20,7 +19,7 @@ struct _Ecordova_Media_Data
    recorder_h             recorder;
    Ecordova_Media_Status  status;
    Eina_List             *pending;
-   bool                   record_pending;
+   Eina_Bool                   record_pending;
 };
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_mediafile.c b/src/modules/ecordova/tizen/ecordova_mediafile.c
index dd3084541b..99fa2c5b5e 100644
--- a/src/modules/ecordova/tizen/ecordova_mediafile.c
+++ b/src/modules/ecordova/tizen/ecordova_mediafile.c
@@ -4,7 +4,6 @@
 
 #if defined(TIZEN_MEDIA_METADATA_EXTRACTOR) && defined(TIZEN_MEDIA_PLAYER) && defined(TIZEN_MEDIA_RECORDER)
 #include "ecordova_mediafile_private.h"
-#include <stdbool.h>
 #include <limits.h>
 
 #define MY_CLASS ECORDOVA_MEDIAFILE_CLASS
@@ -14,7 +13,7 @@ static void _extract_cb(void *, Ecore_Thread *);
 static void _extract_end_cb(void *, Ecore_Thread *);
 static void _extract_cancel_cb(void *, Ecore_Thread *);
 static void _internal_error_notify(Ecordova_MediaFile_Data *pd);
-static bool _bool_metadata_get(metadata_extractor_h, metadata_extractor_attr_e);
+static Eina_Bool _bool_metadata_get(metadata_extractor_h, metadata_extractor_attr_e);
 static int _int_metadata_get(metadata_extractor_h, metadata_extractor_attr_e);
 
 #define NO_ERROR (INT_MAX)
@@ -32,23 +31,6 @@ _ecordova_mediafile_eo_base_constructor(Eo *obj, Ecordova_MediaFile_Data *pd)
 }
 
 static void
-_ecordova_mediafile_constructor(Eo *obj,
-                                Ecordova_MediaFile_Data *pd EINA_UNUSED,
-                                const char *name,
-                                const char *url,
-                                const char *type,
-                                time_t last_modified_date,
-                                long size)
-{
-   DBG("(%p)", obj);
-   eo_do_super(obj, MY_CLASS, ecordova_file_constructor(name,
-                                                        url,
-                                                        type,
-                                                        last_modified_date,
-                                                        size));
-}
-
-static void
 _ecordova_mediafile_eo_base_destructor(Eo *obj, Ecordova_MediaFile_Data *pd)
 {
    DBG("(%p)", obj);
@@ -95,8 +77,8 @@ _extract_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
    pd->metadata.codecs = NULL; // TODO: what is it?
    pd->metadata.duration = _int_metadata_get(pd->extractor, METADATA_DURATION) / 1000;
 
-   bool has_video = _bool_metadata_get(pd->extractor, METADATA_HAS_VIDEO);
-   bool has_audio = _bool_metadata_get(pd->extractor, METADATA_HAS_AUDIO);
+   Eina_Bool has_video = _bool_metadata_get(pd->extractor, METADATA_HAS_VIDEO);
+   Eina_Bool has_audio = _bool_metadata_get(pd->extractor, METADATA_HAS_AUDIO);
 
    DBG("has_video=%d, has_audio=%d", has_video, has_audio);
    if (has_video)
@@ -151,11 +133,11 @@ _internal_error_notify(Ecordova_MediaFile_Data *pd)
    eo_do(pd->obj, eo_event_callback_call(ECORDOVA_MEDIAFILE_EVENT_ERROR, &error));
 }
 
-static bool
+static Eina_Bool
 _bool_metadata_get(metadata_extractor_h extractor,
                    metadata_extractor_attr_e attr)
 {
-   bool result = false;
+   Eina_Bool result = EINA_FALSE;
    char *value = NULL;
    int ret = metadata_extractor_get_metadata(extractor, attr, &value);
    if (value)
@@ -164,7 +146,7 @@ _bool_metadata_get(metadata_extractor_h extractor,
         free(value);
      }
 
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(METADATA_EXTRACTOR_ERROR_NONE == ret, false);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(METADATA_EXTRACTOR_ERROR_NONE == ret, EINA_FALSE);
    return result;
 }
 
diff --git a/src/modules/ecordova/tizen/ecordova_networkinformation.c b/src/modules/ecordova/tizen/ecordova_networkinformation.c
index c8740d2a10..87a2f805eb 100644
--- a/src/modules/ecordova/tizen/ecordova_networkinformation.c
+++ b/src/modules/ecordova/tizen/ecordova_networkinformation.c
@@ -29,13 +29,6 @@ _ecordova_networkinformation_eo_base_constructor(Eo *obj,
 }
 
 static void
-_ecordova_networkinformation_constructor(Eo *obj EINA_UNUSED,
-                                         Ecordova_NetworkInformation_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_networkinformation_eo_base_destructor(Eo *obj,
                                                 Ecordova_NetworkInformation_Data *pd)
 {
diff --git a/src/modules/ecordova/tizen/ecordova_systeminfo.c b/src/modules/ecordova/tizen/ecordova_systeminfo.c
index 0dc4f7f971..66336d89bb 100644
--- a/src/modules/ecordova/tizen/ecordova_systeminfo.c
+++ b/src/modules/ecordova/tizen/ecordova_systeminfo.c
@@ -6,7 +6,6 @@
 
 #include <vconf.h>
 
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -27,17 +26,10 @@ _ecordova_systeminfo_eo_base_constructor(Eo *obj,
 
    pd->obj = obj;
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-}
-
-static void
-_ecordova_systeminfo_constructor(Eo *obj,
-                                 Ecordova_SystemInfo_Data *pd)
-{
-   DBG("(%p)", obj);
-
    eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _add_cb, pd));
    eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _del_cb, pd));
+   
+   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
 }
 
 static void
diff --git a/src/modules/ecordova/tizen/ecordova_systeminfo_private.h b/src/modules/ecordova/tizen/ecordova_systeminfo_private.h
index fceab8c631..bb9c615869 100644
--- a/src/modules/ecordova/tizen/ecordova_systeminfo_private.h
+++ b/src/modules/ecordova/tizen/ecordova_systeminfo_private.h
@@ -13,7 +13,7 @@ struct _Ecordova_SystemInfo_Data
 {
    Eo                               *obj;
    int                               ref_count;
-   bool                              info_initialized;
+   Eina_Bool                              info_initialized;
 };
 
 #endif
diff --git a/src/modules/ecordova/tizen/ecordova_vibration.c b/src/modules/ecordova/tizen/ecordova_vibration.c
index 6d2427e1d5..e1c22f1859 100644
--- a/src/modules/ecordova/tizen/ecordova_vibration.c
+++ b/src/modules/ecordova/tizen/ecordova_vibration.c
@@ -29,13 +29,6 @@ _ecordova_vibration_eo_base_constructor(Eo *obj, Ecordova_Vibration_Data *pd)
 }
 
 static void
-_ecordova_vibration_constructor(Eo *obj EINA_UNUSED,
-                                Ecordova_Vibration_Data *pd EINA_UNUSED)
-{
-   DBG("(%p)", obj);
-}
-
-static void
 _ecordova_vibration_eo_base_destructor(Eo *obj,
                                        Ecordova_Vibration_Data *pd EINA_UNUSED)
 {
diff --git a/src/tests/ecordova/ecordova_console_test.c b/src/tests/ecordova/ecordova_console_test.c
index 2c39de5d61..a762ac761e 100644
--- a/src/tests/ecordova/ecordova_console_test.c
+++ b/src/tests/ecordova/ecordova_console_test.c
@@ -26,9 +26,7 @@ static Ecordova_Device *
 _console_new(void)
 {
    fprintf(stderr, "Creating class\n"); fflush(stderr);
-   return eo_add(ECORDOVA_CONSOLE_CLASS,
-                 NULL,
-                 ecordova_console_constructor());
+   return eo_add(ECORDOVA_CONSOLE_CLASS, NULL);
    fprintf(stderr, "Created class\n"); fflush(stderr);
 }
 
diff --git a/src/tests/ecordova/ecordova_directoryentry_test.c b/src/tests/ecordova/ecordova_directoryentry_test.c
index c22704c96d..972f411448 100644
--- a/src/tests/ecordova/ecordova_directoryentry_test.c
+++ b/src/tests/ecordova/ecordova_directoryentry_test.c
@@ -25,12 +25,12 @@ _teardown(void)
 
 Ecordova_DirectoryEntry *
 directoryentry_new(const char *name,
-                   const char *path,
-                   const char *url)
+                   const char *path)
 {
    return eo_add(ECORDOVA_DIRECTORYENTRY_CLASS,
                  NULL,
-                 ecordova_directoryentry_constructor(name, path, NULL, url));
+                 ecordova_entry_name_set(name),
+                 ecordova_entry_path_set(path));
 }
 
 void
@@ -63,13 +63,13 @@ _create_tmpdir(Eina_Tmpstr **tmpdir)
    strncpy(path, *tmpdir, len);
    path[len] = '\0';
 
-   return directoryentry_new(name, path, *tmpdir);
+   return directoryentry_new(name, path);
 }
 
 START_TEST(smoke)
 {
    Ecordova_DirectoryEntry *directory_entry =
-     directoryentry_new("", TESTS_BUILD_DIR, TESTS_BUILD_DIR);
+     directoryentry_new("", TESTS_BUILD_DIR);
    eo_unref(directory_entry);
 }
 END_TEST
diff --git a/src/tests/ecordova/ecordova_directoryreader_test.c b/src/tests/ecordova/ecordova_directoryreader_test.c
index dd10e5d909..7b46e39afb 100644
--- a/src/tests/ecordova/ecordova_directoryreader_test.c
+++ b/src/tests/ecordova/ecordova_directoryreader_test.c
@@ -26,7 +26,7 @@ _directoryreader_new(const char *path)
 {
    return eo_add(ECORDOVA_DIRECTORYREADER_CLASS,
                  NULL,
-                 ecordova_directoryreader_constructor(path));
+                 ecordova_directoryreader_native_set(path));
 }
 
 START_TEST(smoke)
diff --git a/src/tests/ecordova/ecordova_entry_test.c b/src/tests/ecordova/ecordova_entry_test.c
index d92ae6d039..714d69cfcb 100644
--- a/src/tests/ecordova/ecordova_entry_test.c
+++ b/src/tests/ecordova/ecordova_entry_test.c
@@ -27,12 +27,9 @@ START_TEST(smoke)
 {
    Ecordova_Entry *entry = eo_add(ECORDOVA_ENTRY_CLASS,
                                   NULL,
-                                  ecordova_entry_constructor(EINA_FALSE,
-                                                             EINA_TRUE,
-                                                             "",
-                                                             TESTS_BUILD_DIR,
-                                                             NULL,
-                                                             TESTS_BUILD_DIR));
+                                  ecordova_entry_file_is_set(EINA_TRUE),
+                                  ecordova_entry_name_set(""),
+                                  ecordova_entry_path_set(TESTS_BUILD_DIR));
    eo_unref(entry);
 }
 END_TEST
@@ -438,7 +435,7 @@ END_TEST
 
 START_TEST(dir_root_parent)
 {
-   Ecordova_DirectoryEntry *directory_entry = directoryentry_new("", "/", "/");
+   Ecordova_DirectoryEntry *directory_entry = directoryentry_new("", "/");
 
    Ecordova_FileEntry *parent_entry = NULL;
    bool error = false;
diff --git a/src/tests/ecordova/ecordova_file_tests.h b/src/tests/ecordova/ecordova_file_tests.h
index f9842da10d..00667b17bc 100644
--- a/src/tests/ecordova/ecordova_file_tests.h
+++ b/src/tests/ecordova/ecordova_file_tests.h
@@ -18,7 +18,7 @@ bool directoryentry_get(Ecordova_DirectoryEntry *directory_entry, const char *,
 bool fileentry_get(Ecordova_DirectoryEntry *directory_entry, const char *, Ecordova_FileFlags, Ecordova_FileEntry **);
 void check_exists(const char *url);
 void check_doesnt_exist(const char *url);
-Ecordova_DirectoryEntry *directoryentry_new(const char *, const char *, const char *);
+Ecordova_DirectoryEntry *directoryentry_new(const char *, const char *);
 
 bool entry_remove(Ecordova_Entry *);
 bool entry_do(Ecordova_Entry *, const Eo_Event_Description *, void(*)());
diff --git a/src/tests/ecordova/ecordova_fileentry_test.c b/src/tests/ecordova/ecordova_fileentry_test.c
index 06e172bc01..41070c653f 100644
--- a/src/tests/ecordova/ecordova_fileentry_test.c
+++ b/src/tests/ecordova/ecordova_fileentry_test.c
@@ -26,16 +26,12 @@ _teardown(void)
 
 static Ecordova_File *
 _fileentry_new(const char *name,
-               const char *path,
-               Ecordova_FileSystem *file_system,
-               const char *url)
+               const char *path)
 {
    return eo_add(ECORDOVA_FILEENTRY_CLASS,
                  NULL,
-                 ecordova_fileentry_constructor(name,
-                                                path,
-                                                file_system,
-                                                url));
+                 ecordova_entry_name_set(name),
+                 ecordova_entry_path_set(path));
 }
 
 Ecordova_FileEntry *
@@ -66,7 +62,7 @@ create_tmpfile_size(Eina_Tmpstr **url, unsigned char **content, size_t size)
    write(fd, *content, size);
    close(fd);
 
-   return _fileentry_new(name, path, NULL, *url);
+   return _fileentry_new(name, path);
 }
 
 unsigned char *
@@ -87,7 +83,7 @@ generate_random_buffer_size(size_t size)
 
 START_TEST(smoke)
 {
-   Ecordova_File *fileentry = _fileentry_new("", "", NULL, "");
+   Ecordova_File *fileentry = _fileentry_new("", "");
    eo_unref(fileentry);
 }
 END_TEST
diff --git a/src/tests/ecordova/ecordova_filereader_test.c b/src/tests/ecordova/ecordova_filereader_test.c
index e5ca32797f..8a3e3ad3d2 100644
--- a/src/tests/ecordova/ecordova_filereader_test.c
+++ b/src/tests/ecordova/ecordova_filereader_test.c
@@ -27,9 +27,7 @@ _teardown(void)
 static Ecordova_FileReader *
 _filereader_new(void)
 {
-   return eo_add(ECORDOVA_FILEREADER_CLASS,
-                 NULL,
-                 ecordova_filereader_constructor());
+   return eo_add(ECORDOVA_FILEREADER_CLASS, NULL);
 }
 
 START_TEST(smoke)
diff --git a/src/tests/ecordova/ecordova_filetransfer_test.c b/src/tests/ecordova/ecordova_filetransfer_test.c
index a24579f373..6e31008ef2 100644
--- a/src/tests/ecordova/ecordova_filetransfer_test.c
+++ b/src/tests/ecordova/ecordova_filetransfer_test.c
@@ -29,9 +29,7 @@ _teardown(void)
 static Ecordova_Device *
 _filetransfer_new(void)
 {
-   return eo_add(ECORDOVA_FILETRANSFER_CLASS,
-                 NULL,
-                 ecordova_filetransfer_constructor());
+   return eo_add(ECORDOVA_FILETRANSFER_CLASS, NULL);
 }
 
 START_TEST(smoke)
diff --git a/src/tests/ecordova/ecordova_filewriter_test.c b/src/tests/ecordova/ecordova_filewriter_test.c
index f7662e8499..1773787805 100644
--- a/src/tests/ecordova/ecordova_filewriter_test.c
+++ b/src/tests/ecordova/ecordova_filewriter_test.c
@@ -27,9 +27,7 @@ _teardown(void)
 static Ecordova_FileWriter *
 _filewriter_new(Ecordova_File *file)
 {
-   return eo_add(ECORDOVA_FILEWRITER_CLASS,
-                 NULL,
-                 ecordova_filewriter_constructor(file));
+   return eo_add(ECORDOVA_FILEWRITER_CLASS, NULL, ecordova_filewriter_file_set(file));
 }
 
 static Eina_Bool