diff --git a/Globals.h b/Globals.h
index 18766cb24ff59e4caba372dc95981c83cc464d8e..ccfc974c3ccb1ec419bd28fc4bb5b41e7c721553 100644
--- a/Globals.h
+++ b/Globals.h
@@ -3,12 +3,10 @@ namespace RingClientUWP
 /* public enumerations. */
 public enum class CallStatus {
     NONE,
-    INCOMING_RINGING,
-    OUTGOING_RINGING,
-    SEARCHING,
+    RINGING,
+    CONNECTING,
     IN_PROGRESS,
     PAUSED,
-    ENDED,
     TERMINATING
 };
 
diff --git a/MainPage.xaml.cpp b/MainPage.xaml.cpp
index d0f44c2eeb600acdcc9443892fa91622af30aa80..70f8418d55b2353fb54a9f68cbc00885d4774166 100644
--- a/MainPage.xaml.cpp
+++ b/MainPage.xaml.cpp
@@ -76,11 +76,11 @@ MainPage::MainPage()
                        Platform::Object^>(this, &MainPage::DisplayProperties_DpiChanged));
 
     visibilityChangedEventToken = Window::Current->VisibilityChanged +=
-        ref new WindowVisibilityChangedEventHandler(this, &MainPage::Application_VisibilityChanged);
+                                      ref new WindowVisibilityChangedEventHandler(this, &MainPage::Application_VisibilityChanged);
     applicationSuspendingEventToken = Application::Current->Suspending +=
-        ref new SuspendingEventHandler(this, &MainPage::Application_Suspending);
+                                          ref new SuspendingEventHandler(this, &MainPage::Application_Suspending);
     applicationResumingEventToken = Application::Current->Resuming +=
-        ref new EventHandler<Object^>(this, &MainPage::Application_Resuming);
+                                        ref new EventHandler<Object^>(this, &MainPage::Application_Resuming);
 }
 
 void
@@ -250,7 +250,7 @@ void RingClientUWP::MainPage::OnstateChange(Platform::String ^callId, RingClient
 
     switch (state) {
     /* send the user to the peer's message text page */
-    case CallStatus::ENDED:
+    case CallStatus::NONE:
     {
         if (item)
             OnsummonMessageTextPage();
@@ -370,9 +370,9 @@ MainPage::BeginExtendedExecution()
     newSession->Reason = ExtendedExecutionReason::SavingData;
     newSession->Description = "Extended Execution";
     sessionRevokedToken = (newSession->Revoked += ref new TypedEventHandler<Object^,
-        ExtendedExecutionRevokedEventArgs^>(this, &MainPage::SessionRevoked));
+                           ExtendedExecutionRevokedEventArgs^>(this, &MainPage::SessionRevoked));
     return create_task(newSession->RequestExtensionAsync())
-        .then([=](ExtendedExecutionResult result){
+    .then([=](ExtendedExecutionResult result) {
         try {
             switch (result)
             {
diff --git a/RingD.cpp b/RingD.cpp
index 5ba2219e4559b9997b119e88e0c95b44ccbf7aa2..0e96a91445e670529a17cb9c793e1826db9d19df 100644
--- a/RingD.cpp
+++ b/RingD.cpp
@@ -391,7 +391,7 @@ RingClientUWP::RingD::startDaemon()
                     CoreDispatcherPriority::High, ref new DispatchedHandler([=]()
                 {
                     incomingCall(accountId2, callId2, from2);
-                    stateChange(callId2, CallStatus::INCOMING_RINGING, 0);
+                    stateChange(callId2, CallStatus::RINGING, 0);
 
                     auto contact = ContactsViewModel::instance->findContactByName(from2);
                     auto item = SmartPanelItemsViewModel::instance->findItem(contact);
@@ -413,7 +413,7 @@ RingClientUWP::RingD::startDaemon()
 
                 auto state3 = translateCallStatus(state2);
 
-                if (state3 == CallStatus::ENDED)
+                if (state3 == CallStatus::NONE)
                     DRing::hangUp(callId); // solve a bug in the daemon API.
 
 
@@ -840,19 +840,13 @@ RingD::dequeueTasks()
 RingClientUWP::CallStatus RingClientUWP::RingD::translateCallStatus(String^ state)
 {
     if (state == "INCOMING")
-        return CallStatus::INCOMING_RINGING;
+        return CallStatus::RINGING;
 
     if (state == "CURRENT")
         return CallStatus::IN_PROGRESS;
 
-    if (state == "OVER")
-        return CallStatus::ENDED;
-
-    if (state == "RINGING")
-        return CallStatus::OUTGOING_RINGING;
-
-    if (state == "CONNECTING")
-        return CallStatus::SEARCHING;
+    if (state == "CONNECTING" || state == "RINGING")
+        return CallStatus::CONNECTING;
 
 
     return CallStatus::NONE;
diff --git a/SmartPanel.xaml.cpp b/SmartPanel.xaml.cpp
index 5d83d3239a1120e1c2048fd7647536cb8e03a90f..8ffbbcb790c27d54e46746be7cb38ccc6745cbcf 100644
--- a/SmartPanel.xaml.cpp
+++ b/SmartPanel.xaml.cpp
@@ -113,7 +113,6 @@ SmartPanel::SmartPanel()
 
         switch (state) {
         case CallStatus::NONE:
-        case CallStatus::ENDED:
         {
             item->_callId = "";
             break;
@@ -532,7 +531,7 @@ Object ^ RingClientUWP::Views::IncomingVisibility::Convert(Object ^ value, Windo
 {
     auto state = static_cast<CallStatus>(value);
 
-    if (state == CallStatus::INCOMING_RINGING)
+    if (state == CallStatus::RINGING)
         return  Windows::UI::Xaml::Visibility::Visible;
     else
         return  Windows::UI::Xaml::Visibility::Collapsed;
@@ -551,7 +550,7 @@ Object ^ RingClientUWP::Views::OutGoingVisibility::Convert(Object ^ value, Windo
 {
     auto state = static_cast<CallStatus>(value);
 
-    if (state == CallStatus::SEARCHING || state == CallStatus::OUTGOING_RINGING)
+    if (state == CallStatus::CONNECTING || state == CallStatus::RINGING)
         return  Windows::UI::Xaml::Visibility::Visible;
     else
         return  Windows::UI::Xaml::Visibility::Collapsed;
@@ -569,7 +568,7 @@ Object ^ RingClientUWP::Views::HasAnActiveCall::Convert(Object ^ value, Windows:
 {
     auto state = static_cast<CallStatus>(value);
 
-    if (state == CallStatus::NONE || state == CallStatus::ENDED)
+    if (state == CallStatus::NONE)
         return Windows::UI::Xaml::Visibility::Collapsed;
     else
         return Windows::UI::Xaml::Visibility::Visible;
diff --git a/SmartPanelItem.cpp b/SmartPanelItem.cpp
index ebf3eee9dac14f19d3ffe19270ee0b9bb6ac57ff..ebe9dc3ccb77856e2400414044da2de509e650c3 100644
--- a/SmartPanelItem.cpp
+++ b/SmartPanelItem.cpp
@@ -51,6 +51,6 @@ SmartPanelItem::NotifyPropertyChanged(String^ propertyName)
 void RingClientUWP::Controls::SmartPanelItem::OncallPlaced(Platform::String ^callId)
 {
     if (_callId == callId) {
-        _callStatus = CallStatus::SEARCHING;
+        _callStatus = CallStatus::CONNECTING;
     }
 }
diff --git a/VideoPage.xaml.cpp b/VideoPage.xaml.cpp
index 99a1a3cb866f71aa2d1a3283a898fb773b6a99eb..2c5fd0730814f0a2f27e494f0a08222ee889cc21 100644
--- a/VideoPage.xaml.cpp
+++ b/VideoPage.xaml.cpp
@@ -120,7 +120,7 @@ VideoPage::VideoPage()
     RingD::instance->stateChange +=
         ref new StateChange([&](String^ callId, CallStatus state, int code)
     {
-        if (state == CallStatus::ENDED) {
+        if (state == CallStatus::NONE) {
             Video::VideoManager::instance->rendererManager()->raiseClearRenderTarget();
         }
     });