diff --git a/elementaryxx/include/elementaryxx/Elementaryxx.h b/elementaryxx/include/elementaryxx/Elementaryxx.h
index ed11e04..ce953f0 100644
--- a/elementaryxx/include/elementaryxx/Elementaryxx.h
+++ b/elementaryxx/include/elementaryxx/Elementaryxx.h
@@ -13,7 +13,6 @@
 #include "Button.h"
 #include "Clock.h"
 #include "Scroller.h"
-#include "Toggle.h"
 #include "Entry.h"
 #include "Slider.h"
 #include "Label.h"
diff --git a/elementaryxx/include/elementaryxx/Object.h b/elementaryxx/include/elementaryxx/Object.h
index 5b8be67..f237286 100644
--- a/elementaryxx/include/elementaryxx/Object.h
+++ b/elementaryxx/include/elementaryxx/Object.h
@@ -55,8 +55,8 @@ public:
    *
    * @ingroup General
    */
-  void setTextPart (const std::string &label);
-  void setTextPart (const std::string &part, const std::string &label);
+  void setText (const std::string &label);
+  void setText (const std::string &part, const std::string &label);
 
   /**
    * Get a label of an object
@@ -69,8 +69,8 @@ public:
    *
    * @ingroup General
    */
-  const std::string getTextPart ();
-  const std::string getTextPart (const std::string &part);
+  const std::string getText ();
+  const std::string getText (const std::string &part);
 
   /**
    * Set a content of an object
@@ -83,8 +83,8 @@ public:
    *
    * @ingroup General
    */
-  void setContentPart (const Evasxx::Object &content);
-  void setContentPart (const std::string &part, const Evasxx::Object &content);
+  void setContent (const Evasxx::Object &content);
+  void setContent (const std::string &part, const Evasxx::Object &content);
 
   /**
    * Get a content of an object
@@ -97,8 +97,8 @@ public:
    *
    * @ingroup General
    */
-  Eflxx::CountedPtr <Evasxx::Object> getContentPart ();
-  Eflxx::CountedPtr <Evasxx::Object> getContentPart (const std::string &part);
+  Eflxx::CountedPtr <Evasxx::Object> getContent ();
+  Eflxx::CountedPtr <Evasxx::Object> getContent (const std::string &part);
 
   /**
    * Unset a content of an object
diff --git a/elementaryxx/src/Object.cpp b/elementaryxx/src/Object.cpp
index a147600..e6368bf 100644
--- a/elementaryxx/src/Object.cpp
+++ b/elementaryxx/src/Object.cpp
@@ -108,37 +108,37 @@ const std::string Object::getWidgetType ()
   return elm_object_widget_type_get (o);
 }
 
-void Object::setTextPart (const std::string &label)
+void Object::setText (const std::string &label)
 {
   elm_object_part_text_set(o, NULL, label.c_str());
 }
 
-void Object::setTextPart (const std::string &part, const std::string &label)
+void Object::setText (const std::string &part, const std::string &label)
 {
   elm_object_part_text_set(o, part.c_str(), label.c_str());
 }
 
-const std::string Object::getTextPart ()
+const std::string Object::getText ()
 {
   return elm_object_part_text_get(o, NULL);
 }
 
-const std::string Object::getTextPart (const std::string &part)
+const std::string Object::getText (const std::string &part)
 {
   return elm_object_part_text_get(o, part.c_str());
 }
 
-void Object::setContentPart (const Evasxx::Object &content)
+void Object::setContent (const Evasxx::Object &content)
 {
   elm_object_part_content_set(o, NULL, content.obj());
 }
 
-void Object::setContentPart (const std::string &part, const Evasxx::Object &content)
+void Object::setContent (const std::string &part, const Evasxx::Object &content)
 {
   elm_object_part_content_set(o, part.c_str(), content.obj());
 }
 
-Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart ()
+Eflxx::CountedPtr <Evasxx::Object> Object::getContent ()
 {
   Evas_Object *eo = elm_object_part_content_get(o, NULL);
  
@@ -147,7 +147,7 @@ Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart ()
   return Eflxx::CountedPtr <Evasxx::Object> (ret_o);
 }
 
-Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart (const std::string &part)
+Eflxx::CountedPtr <Evasxx::Object> Object::getContent (const std::string &part)
 {
   Evas_Object *eo = elm_object_part_content_get(o, part.c_str());