diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index 174d390..e52e2c8 100644
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -183,10 +183,10 @@ public:
     mTapGestureDetector.DetectedSignal().Connect(this, &MotionBlurExampleApp::OnTap);
 
     Dali::Window winHandle = app.GetWindow();
-    winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT);
-    winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE);
-    winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
-    winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
     winHandle.ResizeSignal().Connect(this, &MotionBlurExampleApp::OnWindowResized);
 
     // set initial orientation
diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index 7b815fa..dd55e34 100644
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -162,10 +162,10 @@ public:
 
     // set initial orientation
     Dali::Window winHandle = app.GetWindow();
-    winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT);
-    winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE);
-    winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
-    winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
     winHandle.ResizeSignal().Connect(this, &MotionStretchExampleApp::OnWindowResized);
 
     // set initial orientation
diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index dc3315a..b7641fc 100644
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -199,10 +199,10 @@ void PageTurnExample::OnInit(Application& app)
   Window window = app.GetWindow();
   window.KeyEventSignal().Connect(this, &PageTurnExample::OnKeyEvent);
 
-  window.AddAvailableOrientation(Window::PORTRAIT);
-  window.AddAvailableOrientation(Window::LANDSCAPE);
-  window.AddAvailableOrientation(Window::PORTRAIT_INVERSE);
-  window.AddAvailableOrientation(Window::LANDSCAPE_INVERSE);
+  window.AddAvailableOrientation(WindowOrientation::PORTRAIT);
+  window.AddAvailableOrientation(WindowOrientation::LANDSCAPE);
+  window.AddAvailableOrientation(WindowOrientation::PORTRAIT_INVERSE);
+  window.AddAvailableOrientation(WindowOrientation::LANDSCAPE_INVERSE);
   window.ResizeSignal().Connect(this, &PageTurnExample::OnWindowResized);
 
   Window::WindowSize size = window.GetSize();
diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 8d84507..9bd1c3b 100755
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -294,17 +294,17 @@ void DaliTableView::Initialize(Application& application)
 
   if(windowSize.GetWidth() <= windowSize.GetHeight())
   {
-    winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT);
-    winHandle.RemoveAvailableOrientation(Dali::Window::LANDSCAPE);
-    winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
-    winHandle.RemoveAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
+    winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
+    winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
   }
   else
   {
-    winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE);
-    winHandle.RemoveAvailableOrientation(Dali::Window::PORTRAIT);
-    winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
-    winHandle.RemoveAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
+    winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
+    winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
+    winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
   }
 
   // Set initial orientation