diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp
index 6ad029b..0761d03 100644
--- a/examples/bezier-curve/bezier-curve-example.cpp
+++ b/examples/bezier-curve/bezier-curve-example.cpp
@@ -357,12 +357,12 @@ public:
     mControlPoint1 = CreateControlPoint( parent,
                                          CIRCLE1_IMAGE,
                                          CONTROL_POINT1_ORIGIN );
-    mControlPoint1Id = mControlPoint1.GetId();
+    mControlPoint1Id = mControlPoint1.GetProperty< int >( Actor::Property::ID );
 
     mControlPoint2 = CreateControlPoint( parent,
                                          CIRCLE2_IMAGE,
                                          CONTROL_POINT2_ORIGIN );
-    mControlPoint2Id = mControlPoint2.GetId();
+    mControlPoint2Id = mControlPoint2.GetProperty< int >( Actor::Property::ID );
 
     Property::Map lineVertexFormat;
     lineVertexFormat["aPosition"] = Property::VECTOR2;
diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index 6aae5ae..bcb3234 100644
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -283,7 +283,7 @@ public:
 
     mItemView.AddLayout( *mLayout );
 
-    mItemView.SetKeyboardFocusable( true );
+    mItemView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
 
     mFiles.clear();
     FileList files;
@@ -546,7 +546,7 @@ public:
    */
   void OnQuitOrBack()
   {
-    if ( mItemView.OnStage() )
+    if ( mItemView.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
     {
       mApp.Quit();
     }
diff --git a/examples/contact-cards/contact-card.cpp b/examples/contact-cards/contact-card.cpp
index 97c1b94..1f8735e 100644
--- a/examples/contact-cards/contact-card.cpp
+++ b/examples/contact-cards/contact-card.cpp
@@ -169,7 +169,7 @@ ContactCard::ContactCard(
   mDetailText.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   mDetailText.SetProperty( Actor::Property::POSITION, Vector2( mContactCardLayoutInfo.textFoldedPosition.x, mContactCardLayoutInfo.textFoldedPosition.y ));
   mDetailText.SetProperty( Actor::Property::SIZE, Vector2( mContactCardLayoutInfo.unfoldedSize.width - mContactCardLayoutInfo.textFoldedPosition.x * 2.0f, 0.0f ) );
-  mDetailText.SetProperty( DevelActor::Property::OPACITY, 0.0f );
+  mDetailText.SetProperty( Actor::Property::OPACITY, 0.0f );
 
   // Attach tap detection to the overall clip control
   mTapDetector = TapGestureDetector::New();
diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp
index b335e11..409e358 100644
--- a/examples/dissolve-effect/dissolve-effect-example.cpp
+++ b/examples/dissolve-effect/dissolve-effect-example.cpp
@@ -305,7 +305,7 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement)
   mCurrentImage.SetProperty( Toolkit::ImageView::Property::IMAGE, mDissolveEffect );
   mAnimation.AnimateTo( Property( mCurrentImage, "uPercentage" ), 1.0f, AlphaFunction::LINEAR );
 
-  mNextImage.SetProperty( DevelActor::Property::OPACITY,0.0f);
+  mNextImage.SetProperty( Actor::Property::OPACITY,0.0f);
   mAnimation.AnimateTo( Property( mNextImage, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::LINEAR );
 
   if(mUseHighPrecision)
diff --git a/examples/drag-and-drop/drag-and-drop-example.cpp b/examples/drag-and-drop/drag-and-drop-example.cpp
index 4cbe592..1c76b37 100755
--- a/examples/drag-and-drop/drag-and-drop-example.cpp
+++ b/examples/drag-and-drop/drag-and-drop-example.cpp
@@ -132,7 +132,7 @@ public:
     DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---OnStart---\n");
     DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---control name is %s---\n", control.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
 
-    control.SetProperty( DevelActor::Property::OPACITY,0.1f);
+    control.SetProperty( Actor::Property::OPACITY,0.1f);
     Vector2 screenPos  = detector.GetCurrentScreenPosition();
     control.ScreenToLocal(mDragLocalPos.x, mDragLocalPos.y,screenPos.x, screenPos.y );
     Rect<float> targetRect(screenPos.x, screenPos.y, 0.0f, 0.0f);
@@ -237,7 +237,7 @@ public:
 
     Animation dropAnimation = Animation::New(0.5f);
     dropAnimation.AnimateBetween(Property(mTextLabel[mDragRealIndex], Actor::Property::POSITION), k0, AlphaFunction::EASE_OUT);
-    dropAnimation.AnimateBetween(Property(mTextLabel[mDragRealIndex], DevelActor::Property::OPACITY), k1, AlphaFunction::EASE_OUT);
+    dropAnimation.AnimateBetween(Property(mTextLabel[mDragRealIndex], Actor::Property::OPACITY), k1, AlphaFunction::EASE_OUT);
     dropAnimation.Play();
   }
 
@@ -254,7 +254,7 @@ public:
     DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---OnEnd---\n");
     DALI_LOG_INFO(gDragAndDropFilter, Debug::General, "---control name is %s---\n", control.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
 
-    control.SetProperty( DevelActor::Property::OPACITY,1.0f);
+    control.SetProperty( Actor::Property::OPACITY,1.0f);
   }
 
 private:
diff --git a/examples/focus-integration/focus-integration.cpp b/examples/focus-integration/focus-integration.cpp
index 2c14a33..841930c 100644
--- a/examples/focus-integration/focus-integration.cpp
+++ b/examples/focus-integration/focus-integration.cpp
@@ -66,7 +66,7 @@ public:
     contentTable.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
     contentTable.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
     contentTable.SetCellPadding(Size(MARGIN_SIZE, MARGIN_SIZE * 0.5f));
-    contentTable.SetKeyboardFocusable(true);
+    contentTable.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
 
     for( unsigned int i = 0; i < contentTable.GetRows(); ++i )
     {
@@ -93,7 +93,7 @@ public:
     mContainer.SetRelativeHeight( 1, 0.3f);
     mContainer.SetRelativeHeight( 2, 0.2f);
     mContainer.SetRelativeHeight( 3, 0.3f);
-    mContainer.SetKeyboardFocusable(true);
+    mContainer.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
     contentTable.Add( mContainer );
 
     // Make name label for each controls
@@ -134,7 +134,7 @@ public:
     for(int i = 0; i<6; i++)
     {
       Control control = Control::DownCast( mContainer.GetChildAt( TableView::CellPosition( (i/3)*2+1, i%3 ) ) );
-      control.SetKeyboardFocusable(true);
+      control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
       control.SetProperty( Dali::Actor::Property::NAME,ITEMNAME[i]);
       control.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
       control.KeyEventSignal().Connect( this, &FocusIntegrationExample::OnControlKeyEvent );
diff --git a/examples/frame-callback/frame-callback-example.cpp b/examples/frame-callback/frame-callback-example.cpp
index 07ebd6d..a52ee11 100644
--- a/examples/frame-callback/frame-callback-example.cpp
+++ b/examples/frame-callback/frame-callback-example.cpp
@@ -113,7 +113,7 @@ private:
 
       // Add the ID of the created ImageView to mFrameCallback.
       // Again, can call methods in mFrameCallback directly as we have not set it on the stage yet.
-      mFrameCallback.AddId( imageView.GetId() );
+      mFrameCallback.AddId( imageView.GetProperty< int >( Actor::Property::ID ) );
 
       mStage.Add( imageView );
 
diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp
index cad0c66..81cd2c7 100644
--- a/examples/gestures/gesture-example.cpp
+++ b/examples/gestures/gesture-example.cpp
@@ -89,7 +89,7 @@ void AddHelpInfo( const std::string&& string, Actor parent, Animation animation,
   text.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER );
   text.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
   text.SetProperty( Actor::Property::POSITION, position );
-  text.SetProperty( DevelActor::Property::OPACITY, 0.0f );
+  text.SetProperty( Actor::Property::OPACITY, 0.0f );
   text.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, Text::HorizontalAlignment::CENTER );
   text.SetProperty( TextLabel::Property::MULTI_LINE, true );
   parent.Add( text );
diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index 3e2627e..e9dab7d 100644
--- a/examples/homescreen-benchmark/homescreen-benchmark.cpp
+++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -389,7 +389,7 @@ public:
       mScrollParent.Add( page );
     }
 
-    mScrollParent.SetProperty( DevelActor::Property::OPACITY, 1.0f );
+    mScrollParent.SetProperty( Actor::Property::OPACITY, 1.0f );
     mScrollParent.SetProperty( Actor::Property::SCALE, Vector3::ONE );
 
     // Fade in.
diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index bd02a6e..e5f17f3 100644
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -224,7 +224,7 @@ public:
     mGrabCorner.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
     mGrabCorner.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT );
     mGrabCorner.SetProperty( Actor::Property::POSITION, Vector2( -BORDER_WIDTH, -BORDER_WIDTH ));
-    mGrabCorner.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+    mGrabCorner.SetProperty( Actor::Property::OPACITY, 0.6f );
 
     Layer grabCornerLayer = Layer::New();
     grabCornerLayer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
@@ -267,7 +267,7 @@ public:
     imagePrevious.RotateBy( Radian(3.14159265358979323846f), Vector3( 0, 1.0f, 0 ) );
     imagePrevious.SetProperty( Actor::Property::POSITION_Y,  playWidth * 0.5f );
     imagePrevious.SetProperty( Actor::Property::POSITION_X,  playWidth + playWidth * 0.5f );
-    imagePrevious.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+    imagePrevious.SetProperty( Actor::Property::OPACITY, 0.6f );
     controlsLayer.Add( imagePrevious );
     imagePrevious.SetProperty( Dali::Actor::Property::NAME, PREVIOUS_BUTTON_ID );
     imagePrevious.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
@@ -277,7 +277,7 @@ public:
     imageNext.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT );
     imageNext.SetProperty( Actor::Property::POSITION_Y,  playWidth * 0.5f );
     imageNext.SetProperty( Actor::Property::POSITION_X,  stage.GetSize().x - playWidth * 0.5f );
-    imageNext.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+    imageNext.SetProperty( Actor::Property::OPACITY, 0.6f );
     controlsLayer.Add( imageNext );
     imageNext.SetProperty( Dali::Actor::Property::NAME, NEXT_BUTTON_ID );
     imageNext.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
index 70f662e..f4b81bd 100644
--- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
+++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
@@ -477,9 +477,9 @@ public:
       image.SetProperty( Actor::Property::SIZE, imageSize );
       image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
       image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal );
-      mFittingModes[image.GetId()] = fittingMode;
-      mResourceUrls[image.GetId()] = imageSource.configuration.path;
-      mSizes[image.GetId()] = imageSize;
+      mFittingModes[image.GetProperty< int >( Actor::Property::ID )] = fittingMode;
+      mResourceUrls[image.GetProperty< int >( Actor::Property::ID )] = imageSource.configuration.path;
+      mSizes[image.GetProperty< int >( Actor::Property::ID )] = imageSize;
       if ( count < INITIAL_IMAGES_TO_LOAD )
       {
         gridActor.Add( image );
@@ -512,9 +512,9 @@ public:
         animation.Play();
 
         // Change the scaling mode:
-        const unsigned id = actor.GetId();
+        const unsigned id = actor.GetProperty< int >( Actor::Property::ID );
         Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] );
-        const Vector2 imageSize = mSizes[actor.GetId()];
+        const Vector2 imageSize = mSizes[actor.GetProperty< int >( Actor::Property::ID )];
 
         ImageView imageView = ImageView::DownCast( actor );
         if( imageView)
@@ -565,7 +565,7 @@ public:
       if( gridImageView )
       {
         // Cycle the scaling mode options:
-        unsigned int id = gridImageView.GetId();
+        unsigned int id = gridImageView.GetProperty< int >( Actor::Property::ID );
 
         const Vector2 imageSize = mSizes[ id ];
         Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] );
diff --git a/examples/image-view/image-view-example.cpp b/examples/image-view/image-view-example.cpp
index 8377159..f7c1797 100644
--- a/examples/image-view/image-view-example.cpp
+++ b/examples/image-view/image-view-example.cpp
@@ -216,7 +216,7 @@ private:
   {
     unsigned int buttonIndex = GetButtonIndex( button );
 
-    if( mImageViews[buttonIndex].OnStage() )
+    if( mImageViews[buttonIndex].GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
     {
       ++mImageViewImageIndexStatus[buttonIndex];
 
@@ -240,7 +240,7 @@ private:
   {
     unsigned int buttonIndex = GetButtonIndex( button );
 
-    if( mImageViews[buttonIndex].OnStage() )
+    if( mImageViews[buttonIndex].GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
     {
       mImageViewRoundedCornerStatus[ buttonIndex ] = !mImageViewRoundedCornerStatus[ buttonIndex ];
 
diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 55e2c5b..ffba8fd 100644
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -297,7 +297,7 @@ public:
 
     // Activate the spiral layout
     SetLayout( mCurrentLayout );
-    mItemView.SetKeyboardFocusable( true );
+    mItemView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
     KeyboardFocusManager::Get().PreFocusChangeSignal().Connect( this, &ItemViewExample::OnKeyboardPreFocusChange );
 
     // Set the title and icon to the current layout
@@ -892,7 +892,7 @@ public: // From ItemFactory
 
     actor.Add(borderActor);
 
-    actor.SetKeyboardFocusable( true );
+    actor.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
 
     Vector3 spiralItemSize;
     static_cast<ItemLayout&>(*mSpiralLayout).GetItemSize( 0u, Vector3( Stage::GetCurrent().GetSize() ), spiralItemSize );
diff --git a/examples/pivot/pivot-example.cpp b/examples/pivot/pivot-example.cpp
index 332fc00..707557f 100644
--- a/examples/pivot/pivot-example.cpp
+++ b/examples/pivot/pivot-example.cpp
@@ -96,7 +96,7 @@ private:
         Control control = Control::New();
         control.SetBackgroundColor( Vector4( Random::Range( 0.0f, 1.0f ), Random::Range( 0.0f, 1.0f ), Random::Range( 0.0f, 1.0f ), 1.0f ) );
         control.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-        control.SetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT, false ); // Ensures the position always uses top-left for its calculations.
+        control.SetProperty( Actor::Property::POSITION_USES_ANCHOR_POINT, false ); // Ensures the position always uses top-left for its calculations.
         control.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); // This anchor-point is used for the rotation and the scale.
 
         // Add to the table-view
diff --git a/examples/property-notification/property-notification-example.cpp b/examples/property-notification/property-notification-example.cpp
index 8748533..026999d 100644
--- a/examples/property-notification/property-notification-example.cpp
+++ b/examples/property-notification/property-notification-example.cpp
@@ -106,7 +106,7 @@ public:
   void RedComponentNotification( PropertyNotification& /* source */ )
   {
     Animation animation = Animation::New( OPACITY_ANIMATION_DURATION );
-    animation.AnimateTo( Property( mTextLabel, DevelActor::Property::OPACITY ), 0.0f );
+    animation.AnimateTo( Property( mTextLabel, Actor::Property::OPACITY ), 0.0f );
     animation.Play();
   }
 
diff --git a/examples/remote-image-loading/remote-image-loading-example.cpp b/examples/remote-image-loading/remote-image-loading-example.cpp
index bbe3279..8cdac24 100644
--- a/examples/remote-image-loading/remote-image-loading-example.cpp
+++ b/examples/remote-image-loading/remote-image-loading-example.cpp
@@ -47,7 +47,7 @@ public:
   {
     control.TouchSignal().Connect(this, &MyTester::OnControlTouch);
 
-    control.SetKeyboardFocusable(true);
+    control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
     control.KeyEventSignal().Connect(this, &MyTester::OnControlKeyEvent);
     control.KeyInputFocusGainedSignal().Connect(this, &MyTester::OnFocusSet);
     control.KeyInputFocusLostSignal().Connect(this, &MyTester::OnFocusUnSet);
@@ -75,7 +75,7 @@ public:
     mImageView1.SetProperty( Dali::Actor::Property::NAME,"mImageView1");
     mImageView1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
     mImageView1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
-    mImageView1.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
+    mImageView1.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
     mImageView1.SetProperty( Actor::Property::POSITION, Vector2(0, 100));
     mImageView1.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
     stage.Add(mImageView1);
@@ -84,7 +84,7 @@ public:
     mImageView2.SetProperty( Dali::Actor::Property::NAME,"mImageView2");
     mImageView2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
     mImageView2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
-    mImageView2.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
+    mImageView2.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
     mImageView2.SetProperty( Actor::Property::POSITION, Vector2(400, 100));
     mImageView2.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
     stage.Add(mImageView2);
@@ -93,7 +93,7 @@ public:
     mImageView3.SetProperty( Dali::Actor::Property::NAME,"mImageView3");
     mImageView3.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
     mImageView3.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
-    mImageView3.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
+    mImageView3.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
     mImageView3.SetProperty( Actor::Property::POSITION, Vector2(0, 400));
     mImageView3.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
     stage.Add(mImageView3);
@@ -102,7 +102,7 @@ public:
     mImageView4.SetProperty( Dali::Actor::Property::NAME,"mImageView4");
     mImageView4.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
     mImageView4.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
-    mImageView4.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
+    mImageView4.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
     mImageView4.SetProperty( Actor::Property::POSITION, Vector2(400, 400));
     mImageView4.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
     stage.Add(mImageView4);
@@ -111,7 +111,7 @@ public:
     mImageView5.SetProperty( Dali::Actor::Property::NAME,"mImageView5");
     mImageView4.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
     mImageView5.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_CENTER);
-    mImageView5.SetProperty(DevelActor::Property::POSITION_USES_ANCHOR_POINT, false);
+    mImageView5.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false);
     mImageView5.SetProperty( Actor::Property::POSITION, Vector2(800, 100));
     mImageView5.SetBackgroundColor(Vector4(0.0f, 0.0f, 0.0f, 0.0f));
     stage.Add(mImageView5);
diff --git a/examples/simple-visuals-control/my-control-impl.cpp b/examples/simple-visuals-control/my-control-impl.cpp
index b297aea..995259b 100644
--- a/examples/simple-visuals-control/my-control-impl.cpp
+++ b/examples/simple-visuals-control/my-control-impl.cpp
@@ -77,7 +77,7 @@ Demo::MyControl Internal::MyControl::New()
 void MyControl::OnInitialize()
 {
   Dali::Actor self = Self();
-  self.SetKeyboardFocusable( true );
+  self.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
 }
 
 void MyControl::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp
index b386432..24d4f9e 100644
--- a/examples/styling/styling-application.cpp
+++ b/examples/styling/styling-application.cpp
@@ -380,7 +380,7 @@ Actor StylingApplication::CreateResizableContentPane()
   grabHandle.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT );
   grabHandle.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT );
   grabHandle.SetProperty( Actor::Property::POSITION, Vector2( -BORDER_WIDTH, -BORDER_WIDTH ));
-  grabHandle.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+  grabHandle.SetProperty( Actor::Property::OPACITY, 0.6f );
 
   Layer grabCornerLayer = Layer::New();
   grabCornerLayer.SetProperty( Dali::Actor::Property::NAME,"GrabCornerLayer");
diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 54ce940..f77102f 100644
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -471,7 +471,7 @@ public:
         // Use a white button with 50% transparency as a clear color button
         if ( Color::WHITE == AVAILABLE_COLORS[ index ] && styleButtonIndex != StyleType::TEXT_COLOR )
         {
-          mColorButtons[index].SetProperty( DevelActor::Property::OPACITY,0.5f);
+          mColorButtons[index].SetProperty( Actor::Property::OPACITY,0.5f);
 
           mColorButtons[index].SetProperty( Toolkit::Button::Property::LABEL,
                                             Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
diff --git a/examples/text-memory-profiling/text-memory-profiling-example.cpp b/examples/text-memory-profiling/text-memory-profiling-example.cpp
index 453e579..475b594 100644
--- a/examples/text-memory-profiling/text-memory-profiling-example.cpp
+++ b/examples/text-memory-profiling/text-memory-profiling-example.cpp
@@ -389,7 +389,7 @@ public:
    */
   void ReturnToPreviousScreen()
   {
-    if ( mItemView.OnStage() )
+    if ( mItemView.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
     {
       // Quit the application if it is in the main menu
       mApplication.Quit();
diff --git a/examples/text-overlap/text-overlap-example.cpp b/examples/text-overlap/text-overlap-example.cpp
index 8ce642e..ea8700f 100644
--- a/examples/text-overlap/text-overlap-example.cpp
+++ b/examples/text-overlap/text-overlap-example.cpp
@@ -36,8 +36,8 @@ void TextOverlapController::Create( Application& app )
   mLabels[0].SetProperty( Dali::Actor::Property::NAME,"Label1");
   mLabels[1].SetProperty( Dali::Actor::Property::NAME,"Label2");
 
-  mLabels[0].SetProperty( DevelActor::Property::SIBLING_ORDER, 1 );
-  mLabels[1].SetProperty( DevelActor::Property::SIBLING_ORDER, 2 );
+  mLabels[0].SetProperty( Dali::DevelActor::Property::SIBLING_ORDER, 1 );
+  mLabels[1].SetProperty( Dali::DevelActor::Property::SIBLING_ORDER, 2 );
 
   mLabels[0].SetProperty( Control::Property::BACKGROUND, Color::RED );
   mLabels[1].SetProperty( Control::Property::BACKGROUND, Color::YELLOW );
diff --git a/examples/transitions/shadow-button-impl.cpp b/examples/transitions/shadow-button-impl.cpp
index c0117d0..8b02150 100644
--- a/examples/transitions/shadow-button-impl.cpp
+++ b/examples/transitions/shadow-button-impl.cpp
@@ -123,7 +123,7 @@ void ShadowButton::SetCheckState( bool checkState )
 {
   mCheckState = checkState;
   DevelControl::EnableVisual( *this, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
-  if( Self().OnStage() )
+  if( Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
   {
     if( checkState )
     {
diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp
index 093ddff..a90aafa 100644
--- a/examples/video-view/video-view-example.cpp
+++ b/examples/video-view/video-view-example.cpp
@@ -173,7 +173,7 @@ class VideoViewController: public ConnectionTracker
 
   bool OnButtonClicked( Button button )
   {
-    if( mPauseButton.GetId() == button.GetId())
+    if( mPauseButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
     {
        if( mIsPlay )
       {
@@ -186,7 +186,7 @@ class VideoViewController: public ConnectionTracker
         mVideoView.Pause();
       }
     }
-    else if( mPlayButton.GetId() == button.GetId())
+    else if( mPlayButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
     {
       mPauseButton.SetProperty( Actor::Property::VISIBLE, true );
       mPauseButton.SetProperty( Button::Property::DISABLED, false );
@@ -196,7 +196,7 @@ class VideoViewController: public ConnectionTracker
       mIsPlay = true;
       mVideoView.Play();
     }
-    else if( mChangeButton.GetId() == button.GetId())
+    else if( mChangeButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
     {
       bool underlay = false;
       underlay = mVideoView.GetProperty( Toolkit::VideoView::Property::UNDERLAY ).Get< bool >();
@@ -209,11 +209,11 @@ class VideoViewController: public ConnectionTracker
         mVideoView.SetProperty( Toolkit::VideoView::Property::UNDERLAY, true );
       }
     }
-    else if( mBackwardButton.GetId() == button.GetId())
+    else if( mBackwardButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
     {
       mVideoView.Backward( SEEK_POS );
     }
-    else if( mForwardButton.GetId() == button.GetId())
+    else if( mForwardButton.GetProperty< int >( Actor::Property::ID ) == button.GetProperty< int >( Actor::Property::ID ))
     {
       mVideoView.Forward( SEEK_POS );
     }
diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 1987b31..f43e680 100644
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -512,7 +512,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   focusableTile.SetProperty( Actor::Property::NAME, name );
 
   // Set the tile to be keyboard focusable
-  focusableTile.SetKeyboardFocusable( true );
+  focusableTile.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
 
   // Register a property with the ImageView. This allows us to inject the scroll-view position into the shader.
   Property::Value value = Vector3( 0.0f, 0.0f, 0.0f );
@@ -532,7 +532,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   borderImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   borderImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   borderImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  borderImage.SetProperty( DevelActor::Property::OPACITY, 0.8f );
+  borderImage.SetProperty( Actor::Property::OPACITY, 0.8f );
   focusableTile.Add( borderImage );
 
   TextLabel label = TextLabel::New();