TimeTester refatctoring.

	Removed singletone using from TimeTester.
	TimeTester renamed -> TelemetryMonitor.
	All files and directories corrected.
	Tests corrected, all works.
	Disabled 2 tests(task created).

	Related to : APPLINK-21915

67 files changed, 802 insertions, 551 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b265c8a076..bc57be20a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ option(BUILD_BT_SUPPORT "Bluetooth support" ON)
 option(BUILD_USB_SUPPORT "libusb support" ON)
 option(BUILD_BACKTRACE_SUPPORT "backtrace support" ON)
 option(BUILD_TESTS "Possibility to build and run tests" OFF)
-option(TIME_TESTER "Enable profiling time test util" ON)
+option(TELEMETRY_MONITOR "Enable profiling time test util" ON)
 option(ENABLE_LOG "Logging feature" ON)
 option(ENABLE_GCOV "gcov code coverage feature" OFF)
 option(ENABLE_SANITIZE "Sanitize tool" OFF)
@@ -222,8 +222,8 @@ if(ENABLE_LOG)
   set(install-3rd_party_logger "install-3rd_party_logger")
 endif()
 
-if (TIME_TESTER)
-    add_definitions(-DTIME_TESTER)
+if (TELEMETRY_MONITOR)
+    add_definitions(-DTELEMETRY_MONITOR)
 endif()
 
 # TODO(AK): check current OS here
diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt
index 41bc6ba281..6d529e1572 100644
--- a/src/appMain/CMakeLists.txt
+++ b/src/appMain/CMakeLists.txt
@@ -51,9 +51,9 @@ set(default_media_inc
 )
 endif()
 
-if (TIME_TESTER)
-    set(TIME_TESTER_LIB
-        TimeTester)
+if (TELEMETRY_MONITOR)
+    set(TELEMETRY_MONITOR_LIB
+        TelemetryMonitor)
 endif()
 
 set(LIBRARIES
@@ -64,7 +64,7 @@ set(LIBRARIES
   MOBILE_API
   v4_protocol_v1_2_no_extra
   SmartObjects
-  ${TIME_TESTER_LIB}
+  ${TELEMETRY_MONITOR_LIB}
   formatters
   ProtocolLibrary
   ProtocolHandler
@@ -118,7 +118,7 @@ include_directories (
   ${COMPONENTS_DIR}/request_watchdog/include
   ${COMPONENTS_DIR}/smart_objects/include/
   ${COMPONENTS_DIR}/media_manager/include/
-  ${COMPONENTS_DIR}/time_tester/include
+  ${COMPONENTS_DIR}/telemetry_monitor/include
   ${COMPONENTS_DIR}/policy/src/policy/include/
   ${COMPONENTS_DIR}/policy/src/policy/usage_statistics/include/
   ${COMPONENTS_DIR}/resumption/include/
diff --git a/src/appMain/life_cycle.cc b/src/appMain/life_cycle.cc
index dadc7081b3..71ca588e65 100644
--- a/src/appMain/life_cycle.cc
+++ b/src/appMain/life_cycle.cc
@@ -72,9 +72,9 @@ LifeCycle::LifeCycle()
     , hmi_handler_(NULL)
     , hmi_message_adapter_(NULL)
     , media_manager_(NULL)
-#ifdef TIME_TESTER
-    , time_tester_(NULL)
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+    , telemetry_monitor_(NULL)
+#endif  // TELEMETRY_MONITOR
 #ifdef DBUS_HMIADAPTER
     , dbus_adapter_(NULL)
     , dbus_adapter_thread_(NULL)
@@ -161,12 +161,13 @@ bool LifeCycle::StartComponents() {
   connection_handler_->set_protocol_handler(protocol_handler_);
   connection_handler_->set_connection_handler_observer(app_manager_);
 
-// it is important to initialise TimeTester before TM to listen TM Adapters
-#ifdef TIME_TESTER
-  time_tester_ = new time_tester::TimeManager();
-  time_tester_->Start();
-  time_tester_->Init(protocol_handler_);
-#endif  // TIME_TESTER
+// it is important to initialise TelemetryMonitor before TM to listen TM Adapters
+#ifdef TELEMETRY_MONITOR
+  telemetry_monitor_ = new telemetry_monitor::TelemetryMonitor(profile::Profile::instance()->server_address(),
+                                              profile::Profile::instance()->time_testing_port());
+  telemetry_monitor_->Start();
+  telemetry_monitor_->Init(protocol_handler_, app_manager_, transport_manager_);
+#endif  // TELEMETRY_MONITOR
   // It's important to initialise TM after setting up listener chain
   // [TM -> CH -> AM], otherwise some events from TM could arrive at nowhere
   app_manager_->set_protocol_handler(protocol_handler_);
@@ -451,14 +452,14 @@ void LifeCycle::StopComponents() {
   delete hmi_message_adapter_;
   hmi_message_adapter_ = NULL;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   // It's important to delete tester Obcervers after TM adapters destruction
-  if (time_tester_) {
-    time_tester_->Stop();
-    delete time_tester_;
-    time_tester_ = NULL;
+  if (telemetry_monitor_) {
+    telemetry_monitor_->Stop();
+    delete telemetry_monitor_;
+    telemetry_monitor_ = NULL;
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 }
 
 }  //  namespace main_namespace
diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h
index 57f0c3a03f..7f72786164 100644
--- a/src/appMain/life_cycle.h
+++ b/src/appMain/life_cycle.h
@@ -52,8 +52,8 @@
 #include "transport_manager/transport_manager_default.h"
 #include "media_manager/media_manager_impl.h"
 #include "utils/singleton.h"
-#ifdef TIME_TESTER
-#include "time_tester/time_manager.h"
+#ifdef TELEMETRY_MONITOR
+#include "telemetry_monitor/telemetry_monitor.h"
 #endif
 
 //#if ( defined (MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI)  )
@@ -90,7 +90,7 @@ class LifeCycle : public utils::Singleton<LifeCycle> {
 
   private:
     LifeCycle();
-    transport_manager::TransportManager* transport_manager_;
+    transport_manager::TransportManagerImpl* transport_manager_;
     protocol_handler::ProtocolHandlerImpl* protocol_handler_;
     connection_handler::ConnectionHandlerImpl* connection_handler_;
     application_manager::ApplicationManagerImpl* app_manager_;
@@ -101,9 +101,9 @@ class LifeCycle : public utils::Singleton<LifeCycle> {
     hmi_message_handler::HMIMessageHandlerImpl* hmi_handler_;
     hmi_message_handler::HMIMessageAdapterImpl* hmi_message_adapter_;
     media_manager::MediaManagerImpl* media_manager_;
-#ifdef TIME_TESTER
-    time_tester::TimeManager* time_tester_;
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+    telemetry_monitor::TelemetryMonitor* telemetry_monitor_;
+#endif  // TELEMETRY_MONITOR
 #ifdef DBUS_HMIADAPTER
     hmi_message_handler::DBusMessageAdapter* dbus_adapter_;
     System::Thread* dbus_adapter_thread_;
diff --git a/src/appMain/log4cxx.properties b/src/appMain/log4cxx.properties
index e78422744d..4153b487fe 100644
--- a/src/appMain/log4cxx.properties
+++ b/src/appMain/log4cxx.properties
@@ -64,5 +64,5 @@ log4j.logger.ConnectionHandler  = ALL, ProtocolFordHandlingLogFile
 log4j.logger.HeartBeatMonitor   = ALL, ProtocolFordHandlingLogFile
 log4j.logger.ProtocolHandler    = ALL, ProtocolFordHandlingLogFile
 log4j.logger.SecurityManager    = ALL, ProtocolFordHandlingLogFile
-log4j.logger.TimeManager        = ALL
-log4j.logger.TransportManager   = ALL, TransportManagerLogFile
\ No newline at end of file
+log4j.logger.TelemetryMonitor   = ALL
+log4j.logger.TransportManager   = ALL, TransportManagerLogFile
diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
index b6b61d6bd2..d31141b36c 100644
--- a/src/components/CMakeLists.txt
+++ b/src/components/CMakeLists.txt
@@ -80,8 +80,8 @@ add_subdirectory(./config_profile)
 # --- AudioManager
 add_subdirectory(./media_manager)
 
-if (TIME_TESTER)
-    add_subdirectory(./time_tester)
+if (TELEMETRY_MONITOR)
+    add_subdirectory(./telemetry_monitor)
 endif()
 
 
diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/application_manager/include/application_manager/application_manager.h
index acc45a5ef9..f35577fcab 100644
--- a/src/components/application_manager/include/application_manager/application_manager.h
+++ b/src/components/application_manager/include/application_manager/application_manager.h
@@ -43,6 +43,7 @@
 
 #include "utils/data_accessor.h"
 #include "utils/shared_ptr.h"
+#include "telemetry_monitor/telemetry_observable.h"
 
 // Other compomnents class declaration
 namespace hmi_message_handler {
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index c7445619fc..fc80cc2a89 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -72,9 +72,9 @@
 #include "security_manager/ssl_context.h"
 #endif  // ENABLE_SECURITY
 
-#ifdef TIME_TESTER
-#include "time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 
 #include "utils/macro.h"
 #include "utils/shared_ptr.h"
@@ -204,6 +204,9 @@ class ApplicationManagerImpl
       public impl::FromHmiQueue::Handler,
       public impl::ToHmiQueue::Handler,
       public impl::AudioPassThruQueue::Handler,
+#ifdef TELEMETRY_MONITOR
+      public telemetry_monitor::TelemetryObservable<AMTelemetryObserver>,
+#endif  // TELEMETRY_MONITOR
       public utils::Singleton<ApplicationManagerImpl> {
 
   friend class ResumeCtrl;
@@ -303,14 +306,14 @@ class ApplicationManagerImpl
 
   bool is_attenuated_supported() OVERRIDE;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(AMMetricObserver* observer);
-#endif  // TIME_TESTER
+  void SetTelemetryObserver(AMTelemetryObserver* observer);
+#endif  // TELEMETRY_MONITOR
 
   ApplicationSharedPtr RegisterApplication(
       const utils::SharedPtr<smart_objects::SmartObject>&
@@ -1477,9 +1480,9 @@ typedef utils::SharedPtr<timer::Timer> TimerSPtr;
   sync_primitives::Lock stopping_flag_lock_;
   StateController state_ctrl_;
 
-#ifdef TIME_TESTER
-  AMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+  AMTelemetryObserver* metric_observer_;
+#endif  // TELEMETRY_MONITOR
 
   Timer application_list_update_timer_;
 
diff --git a/src/components/application_manager/include/application_manager/time_metric_observer.h b/src/components/application_manager/include/application_manager/telemetry_observer.h
index de3deb8372..052e9c9fee 100644
--- a/src/components/application_manager/include/application_manager/time_metric_observer.h
+++ b/src/components/application_manager/include/application_manager/telemetry_observer.h
@@ -43,7 +43,7 @@
 namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
 namespace application_manager {
 
-class AMMetricObserver {
+class AMTelemetryObserver {
  public:
   struct MessageMetric {
     TimevalStruct begin;
@@ -53,7 +53,7 @@ class AMMetricObserver {
   typedef utils::SharedPtr<MessageMetric> MessageMetricSharedPtr;
 
   virtual void OnMessage(MessageMetricSharedPtr) = 0;
-  virtual ~AMMetricObserver(){}
+  virtual ~AMTelemetryObserver(){}
 };
 }  // application_manager
 #endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_USAGE_STATISTICS_H_
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 027351bc7a..d9a8c4c958 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -119,10 +119,10 @@ ApplicationManagerImpl::ApplicationManagerImpl()
     , stopping_flag_lock_(true)
     , state_ctrl_(this)
     ,
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     metric_observer_(NULL)
     ,
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       application_list_update_timer_(
           "AM ListUpdater",
           new TimerTaskImpl<ApplicationManagerImpl>(
@@ -2014,11 +2014,11 @@ utils::SharedPtr<Message> ApplicationManagerImpl::ConvertRawMsgToMessage(
 void ApplicationManagerImpl::ProcessMessageFromMobile(
     const utils::SharedPtr<Message> message) {
   LOG4CXX_AUTO_TRACE(logger_);
-#ifdef TIME_TESTER
-  AMMetricObserver::MessageMetricSharedPtr metric(
-      new AMMetricObserver::MessageMetric());
+#ifdef TELEMETRY_MONITOR
+  AMTelemetryObserver::MessageMetricSharedPtr metric(
+      new AMTelemetryObserver::MessageMetric());
   metric->begin = date_time::DateTime::getCurrentTime();
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   smart_objects::SmartObjectSPtr so_from_mobile(new smart_objects::SmartObject);
 
   if (!so_from_mobile) {
@@ -2030,19 +2030,19 @@ void ApplicationManagerImpl::ProcessMessageFromMobile(
     LOG4CXX_ERROR(logger_, "Cannot create smart object from message");
     return;
   }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   metric->message = so_from_mobile;
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
   if (!ManageMobileCommand(so_from_mobile, commands::Command::ORIGIN_MOBILE)) {
     LOG4CXX_ERROR(logger_, "Received command didn't run successfully");
   }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   metric->end = date_time::DateTime::getCurrentTime();
   if (metric_observer_) {
     metric_observer_->OnMessage(metric);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 }
 
 void ApplicationManagerImpl::ProcessMessageFromHMI(
@@ -2288,11 +2288,11 @@ bool ApplicationManagerImpl::is_attenuated_supported() {
          profile::Profile::instance()->is_mixing_audio_supported();
 }
 
-#ifdef TIME_TESTER
-void ApplicationManagerImpl::SetTimeMetricObserver(AMMetricObserver* observer) {
+#ifdef TELEMETRY_MONITOR
+void ApplicationManagerImpl::SetTelemetryObserver(AMTelemetryObserver* observer) {
   metric_observer_ = observer;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 void ApplicationManagerImpl::addNotification(const CommandSharedPtr ptr) {
   request_ctrl_.addNotification(ptr);
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
index a62117648f..ae8f195c71 100644
--- a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h
@@ -68,9 +68,9 @@
 
 #include "interfaces/v4_protocol_v1_2_no_extra.h"
 #include "interfaces/v4_protocol_v1_2_no_extra_schema.h"
-#ifdef TIME_TESTER
-#include "time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 
 #include "utils/macro.h"
 #include "utils/shared_ptr.h"
@@ -215,8 +215,8 @@ class ApplicationManagerImpl
   MOCK_METHOD1(Handle, void(const impl::AudioData));
 
 // ApplicationManagerImpl methods:
-#ifdef TIME_TESTER
-  MOCK_METHOD1(SetTimeMetricObserver, void(AMMetricObserver*));
+#ifdef TELEMETRY_MONITOR
+  MOCK_METHOD1(SetTelemetryObserver, void(AMTelemetryObserver*));
 #endif
   MOCK_METHOD1(RegisterApplication,
                ApplicationSharedPtr(
diff --git a/src/components/application_manager/test/mock/mock_telemetry_observer.h b/src/components/application_manager/test/mock/mock_telemetry_observer.h
new file mode 100644
index 0000000000..3130a7382a
--- /dev/null
+++ b/src/components/application_manager/test/mock/mock_telemetry_observer.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2014, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_TIME_METRIC_OBSERVER_H_
+#define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_TIME_METRIC_OBSERVER_H_
+
+#include "gmock/gmock.h"
+#include "application_manager/telemetry_observer.h"
+
+namespace test {
+namespace components {
+namespace application_manager_test {
+
+class MockAMTelemetryObserver : public application_manager::AMTelemetryObserver {
+  public:
+  MOCK_METHOD1(OnMessage, void(MessageMetricSharedPtr));
+};
+
+}  // namespace application_manager_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_TIME_METRIC_OBSERVER_H_
diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc
index 19ead6bcb2..a7eee581ad 100644
--- a/src/components/application_manager/test/state_controller/state_controller_test.cc
+++ b/src/components/application_manager/test/state_controller/state_controller_test.cc
@@ -177,7 +177,7 @@ class StateControllerTest : public ::testing::Test {
 
   connection_handler_test::MockConnectionHandlerSettings
       mock_connection_handler_settings;
-  transport_manager_test::TransportManagerMock mock_transport_manager;
+  transport_manager_test::MockTransportManager mock_transport_manager;
   connection_handler::ConnectionHandlerImpl* conn_handler;
 
   am::HmiStatePtr createHmiState(
diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc
index 1d32355171..4ea6f9dcad 100644
--- a/src/components/connection_handler/test/connection_handler_impl_test.cc
+++ b/src/components/connection_handler/test/connection_handler_impl_test.cc
@@ -230,7 +230,7 @@ class ConnectionHandlerTest : public ::testing::Test {
   }
 
   ConnectionHandlerImpl* connection_handler_;
-  testing::NiceMock<transport_manager_test::TransportManagerMock>
+  testing::NiceMock<transport_manager_test::MockTransportManager>
       mock_transport_manager;
   testing::NiceMock<MockConnectionHandlerSettings>
       mock_connection_handler_settings;
diff --git a/src/components/connection_handler/test/connection_test.cc b/src/components/connection_handler/test/connection_test.cc
index f70c590da0..fac8d8dd8c 100644
--- a/src/components/connection_handler/test/connection_test.cc
+++ b/src/components/connection_handler/test/connection_test.cc
@@ -129,7 +129,7 @@ class ConnectionTest : public ::testing::Test {
 
   Connection* connection_;
   MockConnectionHandlerSettings mock_connection_handler_settings;
-  testing::StrictMock<transport_manager_test::TransportManagerMock>
+  testing::StrictMock<transport_manager_test::MockTransportManager>
       transport_manager_mock;
   ConnectionHandlerImpl* connection_handler_;
   uint32_t session_id;
diff --git a/src/components/include/telemetry_monitor/telemetry_observable.h b/src/components/include/telemetry_monitor/telemetry_observable.h
new file mode 100644
index 0000000000..eb3ff94212
--- /dev/null
+++ b/src/components/include/telemetry_monitor/telemetry_observable.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_TELEMETRY_MONITOR_RESOURCE_OBSERVEABLE_H
+#define SRC_COMPONENTS_INCLUDE_TELEMETRY_MONITOR_RESOURCE_OBSERVEABLE_H
+namespace telemetry_monitor {
+
+template <class TelemetryObserver>
+class TelemetryObservable {
+public:
+    virtual void SetTelemetryObserver(TelemetryObserver* observer) = 0;
+};
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_INCLUDE_TELEMETRY_MONITOR_RESOURCE_OBSERVEABLE_H
diff --git a/src/components/include/test/protocol_handler/mock_protocol_handler.h b/src/components/include/test/protocol_handler/mock_protocol_handler.h
index 36dd61baa8..a73631eda5 100644
--- a/src/components/include/test/protocol_handler/mock_protocol_handler.h
+++ b/src/components/include/test/protocol_handler/mock_protocol_handler.h
@@ -63,4 +63,4 @@ class MockProtocolHandler : public ::protocol_handler::ProtocolHandler {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_HANDLER_H_
+#endif  // SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_HANDLER_SETTINGS_H_
diff --git a/src/components/include/test/protocol_handler/mock_protocol_handler_settings.h b/src/components/include/test/protocol_handler/mock_protocol_handler_settings.h
index 6d7fe727a2..c3e4ec1ddd 100644
--- a/src/components/include/test/protocol_handler/mock_protocol_handler_settings.h
+++ b/src/components/include/test/protocol_handler/mock_protocol_handler_settings.h
@@ -33,7 +33,6 @@
 #define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_HANDLER_SETTINGS_H_
 
 #include "gmock/gmock.h"
-#include "protocol_handler/protocol_handler.h"
 #include "protocol_handler/protocol_handler_settings.h"
 
 namespace test {
diff --git a/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h b/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h
new file mode 100644
index 0000000000..3b3a1b43f7
--- /dev/null
+++ b/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_TELEMETRY_MONITOR_TEST_MOCK_TELEMETRY_OBSERVEABLE_H
+#define SRC_COMPONENTS_INCLUDE_TELEMETRY_MONITOR_TEST_MOCK_TELEMETRY_OBSERVEABLE_H
+
+#include "gmock/gmock.h"
+#include "telemetry_monitor/telemetry_observable.h"
+#include "application_manager/telemetry_observer.h"
+
+namespace test {
+namespace components {
+namespace telemetry_monitor_test {
+
+class MockTelemetryObservable :
+        public telemetry_monitor::TelemetryObservable<
+        application_manager::AMTelemetryObserver> {
+ public:
+  MOCK_METHOD1(SetTelemetryObserver, void(application_manager::AMTelemetryObserver* observer));
+};
+
+}  // namespace telemetry_monitor_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_INCLUDE_TELEMETRY_MONITOR_TEST_MOCK_TELEMETRY_OBSERVEABLE_H
diff --git a/src/components/include/test/transport_manager/transport_manager_mock.h b/src/components/include/test/transport_manager/transport_manager_mock.h
index 26aef63de4..bf20038345 100644
--- a/src/components/include/test/transport_manager/transport_manager_mock.h
+++ b/src/components/include/test/transport_manager/transport_manager_mock.h
@@ -37,6 +37,7 @@
 #include <string>
 #include "transport_manager/transport_manager.h"
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
+#include "telemetry_monitor/telemetry_observable.h"
 
 namespace test {
 namespace components {
@@ -50,7 +51,11 @@ using ::transport_manager::TransportManagerListener;
 /*
  * MOCK implementation of ::transport_manager::TransportManager interface
  */
-class TransportManagerMock : public ::transport_manager::TransportManager {
+class MockTransportManager
+    : public ::transport_manager::TransportManager,
+      public ::telemetry_monitor::TelemetryObservable<
+          transport_manager::TMTelemetryObserver>{
+
  public:
   MOCK_METHOD0(Init, int());
   MOCK_METHOD0(Reinit, int());
@@ -67,6 +72,9 @@ class TransportManagerMock : public ::transport_manager::TransportManager {
   MOCK_METHOD0(Stop, int());
   MOCK_METHOD1(RemoveDevice, int(const DeviceHandle));
   MOCK_CONST_METHOD1(Visibility, int(const bool&));
+  MOCK_METHOD1(SetTelemetryObserver,
+               void(transport_manager::TMTelemetryObserver* observer));
+
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
index 9a820f4cf9..a4ba20e567 100644
--- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h
+++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
@@ -50,7 +50,7 @@
 
 namespace transport_manager {
 
-class TMMetricObserver;
+class TMTelemetryObserver;
 
 namespace transport_adapter {
 
@@ -272,14 +272,14 @@ class TransportAdapter {
    */
   virtual std::string DeviceName(const DeviceUID& device_id) const = 0;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Return Time metric observer
    *
    * @param return pointer to Time metric observer
    */
-  virtual TMMetricObserver* GetTimeMetricObserver() = 0;
-#endif  // TIME_TESTER
+  virtual TMTelemetryObserver* GetTelemetryObserver() = 0;
+#endif  // TELEMETRY_MONITOR
 };
 }  // namespace transport_adapter
 }  // namespace transport_manager
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
index 9795adaa54..bda65803e8 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
@@ -57,9 +57,10 @@
 #include "transport_manager/transport_manager_listener_empty.h"
 #include "connection_handler/connection_handler.h"
 
-#ifdef TIME_TESTER
-#include "protocol_handler/time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "protocol_handler/telemetry_observer.h"
+#include "telemetry_monitor/telemetry_observable.h"
+#endif  // TELEMETRY_MONITOR
 
 #ifdef ENABLE_SECURITY
 #include "security_manager/security_manager.h"
@@ -138,7 +139,12 @@ class ProtocolHandlerImpl
   : public ProtocolHandler,
     public TransportManagerListenerEmpty,
     public impl::FromMobileQueue::Handler,
-    public impl::ToMobileQueue::Handler {
+    public impl::ToMobileQueue::Handler
+#ifdef TELEMETRY_MONITOR
+    ,
+    public telemetry_monitor::TelemetryObservable<PHTelemetryObserver>
+#endif  // TELEMETRY_MONITOR
+    {
  public:
   /**
    * @brief Constructor
@@ -194,14 +200,14 @@ class ProtocolHandlerImpl
    */
   void SendFramesNumber(uint32_t connection_key, int32_t number_of_frames);
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(PHMetricObserver *observer);
-#endif  // TIME_TESTER
+  void SetTelemetryObserver(PHTelemetryObserver *observer);
+#endif  // TELEMETRY_MONITOR
 
   /*
    * Prepare and send heartbeat message to mobile
@@ -545,9 +551,9 @@ class ProtocolHandlerImpl
 
   sync_primitives::Lock protocol_observers_lock_;
 
-#ifdef TIME_TESTER
-  PHMetricObserver *metric_observer_;
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+  PHTelemetryObserver *metric_observer_;
+#endif  // TELEMETRY_MONITOR
 };
 }  // namespace protocol_handler
 #endif  // SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_HANDLER_IMPL_H_
diff --git a/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h b/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h
index 1d3d83ea48..f0923623e0 100644
--- a/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h
+++ b/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h
@@ -39,7 +39,7 @@
 
 namespace protocol_handler {
 
-class PHMetricObserver {
+class PHTelemetryObserver {
  public:
   struct MessageMetric {
     RawMessagePtr raw_msg;
@@ -50,7 +50,7 @@ class PHMetricObserver {
   };
   virtual void StartMessageProcess(uint32_t message_id, const TimevalStruct &start_time) = 0;
   virtual void EndMessageProcess(utils::SharedPtr<MessageMetric> m) = 0;
-  virtual ~PHMetricObserver(){}
+  virtual ~PHTelemetryObserver(){}
 };
 }  // protocol_handler
 #endif  // SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index e0ab97bdcb..f701fb02e5 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -74,9 +74,9 @@ ProtocolHandlerImpl::ProtocolHandlerImpl(const ProtocolHandlerSettings& settings
                                      threads::ThreadOptions(kStackSize)),
       raw_ford_messages_to_mobile_("PH ToMobile", this,
                                    threads::ThreadOptions(kStackSize))
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       , metric_observer_(NULL)
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -320,9 +320,9 @@ void ProtocolHandlerImpl::SendHeartBeat(int32_t connection_id,
 
 void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
                                                  bool final_message) {
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     const TimevalStruct start_time = date_time::DateTime::getCurrentTime();
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   LOG4CXX_AUTO_TRACE(logger_);
   if (!message) {
     LOG4CXX_ERROR(logger_,
@@ -334,12 +334,12 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
   uint8_t sessionID = 0;
   session_observer_.PairFromKey(message->connection_key(), &connection_handle,
                                  &sessionID);
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   uint32_t message_id = message_counters_[sessionID];
   if (metric_observer_) {
     metric_observer_->StartMessageProcess(message_id, start_time);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   const size_t max_frame_size = get_settings().maximum_payload_size();
   size_t frame_size = MAXIMUM_FRAME_DATA_V2_SIZE;
   switch (message->protocol_version()) {
@@ -394,10 +394,10 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
           "ProtocolHandler failed to send multiframe messages.");
     }
   }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
-        PHMetricObserver::MessageMetric *metric
-            = new PHMetricObserver::MessageMetric();
+        PHTelemetryObserver::MessageMetric *metric
+            = new PHTelemetryObserver::MessageMetric();
         metric->message_id = message_id;
         metric->connection_key = message->connection_key();
         metric->raw_msg = message;
@@ -448,9 +448,9 @@ void ProtocolHandlerImpl::OnTMMessageReceived(const RawMessagePtr tm_message) {
 
   for (ProtocolFramePtrList::const_iterator it =
        protocol_frames.begin(); it != protocol_frames.end(); ++it) {
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     const TimevalStruct start_time = date_time::DateTime::getCurrentTime();
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
     ProtocolFramePtr frame = *it;
 #ifdef ENABLE_SECURITY
     const RESULT_CODE result = DecryptFrame(frame);
@@ -460,11 +460,11 @@ void ProtocolHandlerImpl::OnTMMessageReceived(const RawMessagePtr tm_message) {
     }
 #endif  // ENABLE_SECURITY
     impl::RawFordMessageFromMobile msg(frame);
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     if (metric_observer_) {
       metric_observer_->StartMessageProcess(msg->message_id(), start_time);
     }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
     raw_ford_messages_from_mobile_.PostMessage(msg);
   }
@@ -729,10 +729,10 @@ RESULT_CODE ProtocolHandlerImpl::HandleSingleFrameMessage(const ProtocolFramePtr
   if (!rawMessage) {
     return RESULT_FAIL;
   }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
-        PHMetricObserver::MessageMetric *metric
-            = new PHMetricObserver::MessageMetric();
+        PHTelemetryObserver::MessageMetric *metric
+            = new PHTelemetryObserver::MessageMetric();
         metric->message_id = packet->message_id();
         metric->connection_key = connection_key;
         metric->raw_msg = rawMessage;
@@ -1058,14 +1058,14 @@ void ProtocolHandlerImpl::PopValideAndExpirateMultiframes() {
                          frame->payload_size()));
     DCHECK(rawMessage);
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     if (metric_observer_) {
-      PHMetricObserver::MessageMetric *metric =
-          new PHMetricObserver::MessageMetric();
+      PHTelemetryObserver::MessageMetric *metric =
+          new PHTelemetryObserver::MessageMetric();
       metric->raw_msg = rawMessage;
       metric_observer_->EndMessageProcess(metric);
     }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
     NotifySubscribers(rawMessage);
   }
 }
@@ -1296,11 +1296,11 @@ void ProtocolHandlerImpl::SendFramesNumber(uint32_t connection_key,
   }
 }
 
-#ifdef TIME_TESTER
-void ProtocolHandlerImpl::SetTimeMetricObserver(PHMetricObserver *observer) {
+#ifdef TELEMETRY_MONITOR
+void ProtocolHandlerImpl::SetTelemetryObserver(PHTelemetryObserver *observer) {
   metric_observer_ = observer;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 std::string ConvertPacketDataToString(const uint8_t *data,
                                       const size_t data_size) {
diff --git a/src/components/time_tester/test/include/time_manager_mock.h b/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h
index dfdfa2da7b..83037c9631 100644
--- a/src/components/time_tester/test/include/time_manager_mock.h
+++ b/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h
@@ -30,28 +30,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TEST_COMPONENTS_TIME_MANAGER_INCLUDE_TIME_MANAGER_MOCK_H_
-#define TEST_COMPONENTS_TIME_MANAGER_INCLUDE_TIME_MANAGER_MOCK_H_
+#ifndef SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_TIME_METRIC_OBSERVER_H_
+#define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_TIME_METRIC_OBSERVER_H_
+
+#include "gmock/gmock.h"
+#include "protocol_handler/time_metric_observer.h"
+#include "utils/shared_ptr.h"
 
-#include <gmock/gmock.h>
-#include "time_manager.h"
-#include "metric_wrapper.h"
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace protocol_handler_test {
 
-using namespace time_tester;
-/*
- * MOCK implementation of ::security_manager::SecurityManager
- */
-class TimeManagerMock : public time_tester::TimeManager {
+class MockPHTelemetryObserver : public ::protocol_handler::PHTelemetryObserver {
  public:
-  MOCK_METHOD1(Init, void(protocol_handler::ProtocolHandlerImpl* ph));
-  MOCK_METHOD0(Stop, void());
-  MOCK_METHOD0(Start, void());
-  MOCK_METHOD1(SendMetric, void(utils::SharedPtr<MetricWrapper> metric));
+  MOCK_METHOD2(StartMessageProcess, void(uint32_t, const TimevalStruct&));
+  MOCK_METHOD2(EndMessageProcess, void(utils::SharedPtr<MessageMetric>));
 };
-}  // time_tester_test
-}  // components
-}  // test
-#endif  // TEST_COMPONENTS_TIME_MANAGER_INCLUDE_TIME_MANAGER_MOCK_H_
+
+}  // namespace protocol_handler_test
+}  // namespace components
+}  // namespace test
+
+-#endif  // SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_TIME_METRIC_OBSERVER_H_
diff --git a/src/components/protocol_handler/test/protocol_handler_tm_test.cc b/src/components/protocol_handler/test/protocol_handler_tm_test.cc
index 769678dc27..3f04ea5564 100644
--- a/src/components/protocol_handler/test/protocol_handler_tm_test.cc
+++ b/src/components/protocol_handler/test/protocol_handler_tm_test.cc
@@ -193,7 +193,7 @@ class ProtocolHandlerImplTest : public ::testing::Test {
   std::vector<uint8_t> some_data;
   // Strict mocks (same as all methods EXPECT_CALL().Times(0))
   testing::NiceMock<connection_handler_test::MockConnectionHandler> connection_handler_mock;
-  testing::StrictMock<transport_manager_test::TransportManagerMock> transport_manager_mock;
+  testing::StrictMock<transport_manager_test::MockTransportManager> transport_manager_mock;
   testing::StrictMock<protocol_handler_test::MockSessionObserver> session_observer_mock;
 #ifdef ENABLE_SECURITY
   testing::NiceMock<protocol_handler_test::SecurityManagerMock> security_manager_mock;
diff --git a/src/components/time_tester/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt
index 835ce31d46..8ce8d19f85 100644
--- a/src/components/time_tester/CMakeLists.txt
+++ b/src/components/telemetry_monitor/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, Ford Motor Company
+# Copyright (c) 2016, Ford Motor Company
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,11 +29,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-set(TIME_TESTER_SRC_DIR ${COMPONENTS_DIR}/time_tester/src)
+set(TELEMETRY_MONITOR_SRC_DIR ${COMPONENTS_DIR}/telemetry_monitor/src)
 
-include_directories(
+include_directories (
   include
-  include/time_tester
   ${COMPONENTS_DIR}/utils/include/
   ${COMPONENTS_DIR}/protocol_handler/include/
   ${COMPONENTS_DIR}/connection_handler/include/
@@ -51,19 +50,19 @@ include_directories(
 )
 
 set(SOURCES
-    ${TIME_TESTER_SRC_DIR}/metric_wrapper.cc
-    ${TIME_TESTER_SRC_DIR}/time_manager.cc
-    ${TIME_TESTER_SRC_DIR}/application_manager_observer.cc
-    ${TIME_TESTER_SRC_DIR}/transport_manager_observer.cc
-    ${TIME_TESTER_SRC_DIR}/protocol_handler_observer.cc
-    ${TIME_TESTER_SRC_DIR}/application_manager_metric.cc
-    ${TIME_TESTER_SRC_DIR}/transport_manager_metric.cc
-    ${TIME_TESTER_SRC_DIR}/protocol_handler_metric.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/metric_wrapper.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/telemetry_monitor.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_observer.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_observer.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_observer.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_metric.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_metric.cc
+    ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_metric.cc
 )
 
-add_library("TimeTester" ${SOURCES})
-target_link_libraries("TimeTester" ${LIBRARIES})
-add_dependencies("TimeTester" HMI_API MOBILE_API)
+add_library("TelemetryMonitor" ${SOURCES})
+target_link_libraries("TelemetryMonitor" ${LIBRARIES})
+add_dependencies("TelemetryMonitor" HMI_API MOBILE_API)
 
 if(BUILD_TESTS)
   add_subdirectory(test)
diff --git a/src/components/time_tester/include/time_tester/application_manager_metric.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric.h
index 8512158e14..df568e7ebd 100644
--- a/src/components/time_tester/include/time_tester/application_manager_metric.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric.h
@@ -30,25 +30,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_APPLICATION_MANAGER_MECTRIC_WRAPPER_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_APPLICATION_MANAGER_MECTRIC_WRAPPER_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_MECTRIC_WRAPPER_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_MECTRIC_WRAPPER_H_
 
 #include <string>
 
-#include "time_tester/metric_wrapper.h"
-#include "time_tester/application_manager_observer.h"
+#include "telemetry_monitor/metric_wrapper.h"
+#include "telemetry_monitor/application_manager_observer.h"
 
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 class ApplicationManagerObserver;
 
 class ApplicationManagerMetricWrapper: public MetricWrapper {
 
   public:
-    utils::SharedPtr<application_manager::AMMetricObserver::MessageMetric> message_metric;
+    utils::SharedPtr<application_manager::AMTelemetryObserver::MessageMetric> message_metric;
     virtual Json::Value GetJsonMetric();
 };
 
 }
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_APPLICATION_MANAGER_MECTRIC_WRAPPER_H_
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_MECTRIC_WRAPPER_H_
diff --git a/src/components/time_tester/include/time_tester/application_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h
index 834090be41..995aad1085 100644
--- a/src/components/time_tester/include/time_tester/application_manager_observer.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h
@@ -30,26 +30,26 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_APPLICATION_MANAGER_OBSERVER_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_APPLICATION_MANAGER_OBSERVER_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_
 
 #include "utils/message_queue.h"
-#include "application_manager/time_metric_observer.h"
-#include "time_tester/application_manager_metric.h"
+#include "application_manager/telemetry_observer.h"
+#include "telemetry_monitor/application_manager_metric.h"
 
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-class TimeManager;
+class TelemetryMonitor;
 
-class ApplicationManagerObserver: public application_manager::AMMetricObserver {
+class ApplicationManagerObserver: public application_manager::AMTelemetryObserver {
    public:
-    explicit ApplicationManagerObserver(TimeManager* time_manager);
+    explicit ApplicationManagerObserver(TelemetryMonitor* telemetry_monitor);
    virtual void OnMessage(utils::SharedPtr<MessageMetric> metric);
 
   private:
-    TimeManager* time_manager_;
+    TelemetryMonitor* telemetry_monitor_;
 };
 
 }
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_APPLICATION_MANAGER_OBSERVER_H_
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_
diff --git a/src/components/time_tester/include/time_tester/json_keys.h b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h
index 532202067f..f5aba07721 100644
--- a/src/components/time_tester/include/time_tester/json_keys.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h
@@ -31,10 +31,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_JSON_KEYS_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_JSON_KEYS_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_JSON_KEYS_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_JSON_KEYS_H_
 
-namespace time_tester {
+namespace telemetry_monitor {
   namespace strings {
     const char logger[] = "logger";
     const char begin[] = "begin";
@@ -49,4 +49,4 @@ namespace time_tester {
     const char memory[] = "RAM";
   }
 }
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_JSON_KEYS_H_
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_JSON_KEYS_H_
diff --git a/src/components/time_tester/include/time_tester/metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h
index e6d6587f26..66a0dc74f3 100644
--- a/src/components/time_tester/include/time_tester/metric_wrapper.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h
@@ -30,14 +30,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_MECTRIC_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_MECTRIC_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_H_
 
 #include <string>
 #include "utils/resource_usage.h"
 #include "json/json.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 class MetricWrapper {
   utils::ResourseUsage* resources;
@@ -55,5 +55,5 @@ class MetricWrapper {
 };
 
 
-}  // namespace time_tester
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_MECTRIC_H_
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_H_
diff --git a/src/components/time_tester/include/time_tester/protocol_handler_metric.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric.h
index 8b5fb34b86..d3c27ba55b 100644
--- a/src/components/time_tester/include/time_tester/protocol_handler_metric.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric.h
@@ -30,21 +30,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_PROTOCOL_HANDLER_MECTRIC_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_PROTOCOL_HANDLER_MECTRIC_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_H_
 
 #include <string>
 #include "utils/shared_ptr.h"
-#include "time_tester/metric_wrapper.h"
+#include "telemetry_monitor/metric_wrapper.h"
 #include "protocol_handler_observer.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 class ProtocolHandlerMecticWrapper: public MetricWrapper {
 
   public:
-    utils::SharedPtr<protocol_handler::PHMetricObserver::MessageMetric> message_metric;
+    utils::SharedPtr<protocol_handler::PHTelemetryObserver::MessageMetric> message_metric;
     virtual Json::Value GetJsonMetric();
 };
-}  // namespace time_tester
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_PROTOCOL_HANDLER_MECTRIC_H_
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_H_
diff --git a/src/components/time_tester/include/time_tester/protocol_handler_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_observer.h
index 4c962cfc84..c9f6a7f07f 100644
--- a/src/components/time_tester/include/time_tester/protocol_handler_observer.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_observer.h
@@ -30,27 +30,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_PROTOCOL_HANDLER_OBSERVER_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_PROTOCOL_HANDLER_OBSERVER_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_OBSERVER_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_OBSERVER_H_
 
-#include "protocol_handler/time_metric_observer.h"
+#include "protocol_handler/telemetry_observer.h"
 #include "utils/message_queue.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-class TimeManager;
+class TelemetryMonitor;
 
-class ProtocolHandlerObserver: public protocol_handler::PHMetricObserver {
+class ProtocolHandlerObserver: public protocol_handler::PHTelemetryObserver {
  public:
-  explicit ProtocolHandlerObserver(TimeManager* time_manager);
+  explicit ProtocolHandlerObserver(TelemetryMonitor* telemetry_monitor);
 
   virtual void StartMessageProcess(uint32_t message_id, const TimevalStruct& start_time);
 
   virtual void EndMessageProcess(utils::SharedPtr<MessageMetric> m);
 
  private:
-  TimeManager* time_manager_;
+  TelemetryMonitor* telemetry_monitor_;
   std::map<uint32_t, TimevalStruct> time_starts;
 };
-}  // namespace time_tester
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_PROTOCOL_HANDLER_OBSERVER_H_
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_OBSERVER_H_
diff --git a/src/components/time_tester/include/time_tester/time_manager.h b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h
index 08b0a25980..316f687b46 100644
--- a/src/components/time_tester/include/time_tester/time_manager.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
@@ -30,31 +30,30 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_MANAGER_INCLUDE_TIME_MANAGER_MEDIA_MANAGER_H_
-#define SRC_COMPONENTS_TIME_MANAGER_INCLUDE_TIME_MANAGER_MEDIA_MANAGER_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_H_
 
 #include <string>
 
 #include "utils/shared_ptr.h"
 #include "utils/message_queue.h"
 #include "utils/threads/thread.h"
-#include "utils/singleton.h"
 #include "utils/threads/thread_delegate.h"
-#include "time_tester/metric_wrapper.h"
-#include "time_tester/application_manager_observer.h"
+#include "telemetry_monitor/metric_wrapper.h"
+#include "telemetry_monitor/application_manager_observer.h"
 #include "application_manager/application_manager_impl.h"
-#include "time_tester/transport_manager_observer.h"
+#include "telemetry_monitor/transport_manager_observer.h"
 #include "transport_manager/transport_manager_impl.h"
 #include "protocol_handler_observer.h"
 #include "protocol_handler/protocol_handler_impl.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 using ::utils::MessageQueue;
 
 class Streamer : public threads::ThreadDelegate {
  public:
-  explicit Streamer(TimeManager* const server);
+  explicit Streamer(TelemetryMonitor* const server);
   ~Streamer();
   void threadMain() OVERRIDE;
   void exitThreadMain() OVERRIDE;
@@ -67,7 +66,7 @@ class Streamer : public threads::ThreadDelegate {
   bool IsReady() const;
   bool Send(const std::string &msg);
   void ShutDownAndCloseSocket(int32_t socket_fd);
-  TimeManager* const kserver_;
+  TelemetryMonitor* const kserver_;
   int32_t server_socket_fd_;
   int32_t client_socket_fd_;
   volatile bool stop_flag_;
@@ -75,11 +74,14 @@ class Streamer : public threads::ThreadDelegate {
   DISALLOW_COPY_AND_ASSIGN(Streamer);
 };
 
-class TimeManager {
+class TelemetryMonitor {
  public:
-  TimeManager();
-  virtual ~TimeManager();
-  virtual void Init(protocol_handler::ProtocolHandlerImpl* ph);
+  TelemetryMonitor(const std::string& server_address, uint16_t port);
+  virtual ~TelemetryMonitor();
+  virtual void Init(
+      TelemetryObservable<protocol_handler::PHTelemetryObserver>* protocol_handler,
+      TelemetryObservable<application_manager::AMTelemetryObserver>* app_manager,
+      TelemetryObservable<transport_manager::TMTelemetryObserver>* transport_manager);
   virtual void Stop();
   virtual void Start();
   virtual void SendMetric(utils::SharedPtr<MetricWrapper> metric);
@@ -88,8 +90,8 @@ class TimeManager {
   int16_t port() const;
 
  private:
+  std::string server_address_;
   int16_t port_;
-  std::string ip_;
   bool is_ready_;
   threads::Thread* thread_;
   Streamer* streamer_;
@@ -97,7 +99,7 @@ class TimeManager {
   TransportManagerObserver tm_observer;
   ProtocolHandlerObserver ph_observer;
 
-  DISALLOW_COPY_AND_ASSIGN(TimeManager);
+  DISALLOW_COPY_AND_ASSIGN(TelemetryMonitor);
 };
-}  // namespace time_manager
-#endif  // SRC_COMPONENTS_TIME_MANAGER_INCLUDE_TIME_MANAGER_MEDIA_MANAGER_H_
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_H_
diff --git a/src/components/time_tester/include/time_tester/transport_manager_metric.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric.h
index 0ce6a07dc6..1e6cb501bc 100644
--- a/src/components/time_tester/include/time_tester/transport_manager_metric.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric.h
@@ -30,19 +30,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_TRANSPORT_MANAGER_MECTRIC_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_TRANSPORT_MANAGER_MECTRIC_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_H_
 
 #include <string>
-#include "time_tester/metric_wrapper.h"
-#include "time_tester/transport_manager_observer.h"
+#include "telemetry_monitor/metric_wrapper.h"
+#include "telemetry_monitor/transport_manager_observer.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 class TransportManagerMecticWrapper: public MetricWrapper {
  public:
-  utils::SharedPtr<transport_manager::TMMetricObserver::MessageMetric> message_metric;
+  utils::SharedPtr<transport_manager::TMTelemetryObserver::MessageMetric> message_metric;
   virtual Json::Value GetJsonMetric();
 };
-}  // namespace time_tester
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_TRANSPORT_MANAGER_MECTRIC_H_
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_H_
diff --git a/src/components/time_tester/include/time_tester/transport_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h
index bd46ba0822..9390ecd209 100644
--- a/src/components/time_tester/include/time_tester/transport_manager_observer.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h
@@ -30,25 +30,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_TRANSPORT_MANAGER_OBSERVER_H_
-#define SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_TRANSPORT_MANAGER_OBSERVER_H_
+#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_OBSERVER_H_
+#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_OBSERVER_H_
 
-#include "transport_manager/time_metric_observer.h"
+#include "transport_manager/telemetry_observer.h"
 #include "utils/message_queue.h"
 #include "utils/date_time.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-class TimeManager;
+class TelemetryMonitor;
 
-class TransportManagerObserver: public transport_manager::TMMetricObserver {
+class TransportManagerObserver: public transport_manager::TMTelemetryObserver {
  public:
-  explicit TransportManagerObserver(TimeManager* time_manager);
+  explicit TransportManagerObserver(TelemetryMonitor* telemetry_monitor);
   virtual void StartRawMsg(const protocol_handler::RawMessage* ptr);
   virtual void StopRawMsg(const protocol_handler::RawMessage* ptr);
  private:
-  TimeManager* time_manager_;
+  TelemetryMonitor* telemetry_monitor_;
   std::map<const protocol_handler::RawMessage*, TimevalStruct> time_starts;
 };
-}  // namespace time_tester
-#endif  // SRC_COMPONENTS_TIME_TESTER_INCLUDE_TIME_TESTER_TRANSPORT_MANAGER_OBSERVER_H_
+}  // namespace telemetry_monitor
+#endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_OBSERVER_H_
diff --git a/src/components/time_tester/src/application_manager_metric.cc b/src/components/telemetry_monitor/src/application_manager_metric.cc
index 3b6dc7f0e4..0af9570c41 100644
--- a/src/components/time_tester/src/application_manager_metric.cc
+++ b/src/components/telemetry_monitor/src/application_manager_metric.cc
@@ -30,12 +30,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "time_tester/application_manager_metric.h"
-#include "time_tester/json_keys.h"
+#include "telemetry_monitor/application_manager_metric.h"
+#include "telemetry_monitor/json_keys.h"
 #include "application_manager/smart_object_keys.h"
 #include "utils/convert_utils.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 Json::Value ApplicationManagerMetricWrapper::GetJsonMetric() {
   Json::Value result = MetricWrapper::GetJsonMetric();
@@ -52,4 +52,4 @@ Json::Value ApplicationManagerMetricWrapper::GetJsonMetric() {
       params[application_manager::strings::connection_key].asInt());
   return result;
 }
-}  // namespace time_tester
+}  // namespace telemetry_monitor
diff --git a/src/components/time_tester/src/application_manager_observer.cc b/src/components/telemetry_monitor/src/application_manager_observer.cc
index d4bf014f60..47570497cf 100644
--- a/src/components/time_tester/src/application_manager_observer.cc
+++ b/src/components/telemetry_monitor/src/application_manager_observer.cc
@@ -29,21 +29,21 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include "time_tester/application_manager_observer.h"
+#include "telemetry_monitor/application_manager_observer.h"
 #include "utils/shared_ptr.h"
-#include "time_tester/time_manager.h"
-#include "time_tester/application_manager_metric.h"
+#include "telemetry_monitor/telemetry_monitor.h"
+#include "telemetry_monitor/application_manager_metric.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-ApplicationManagerObserver::ApplicationManagerObserver(TimeManager* time_manager):
-  time_manager_(time_manager) {
+ApplicationManagerObserver::ApplicationManagerObserver(TelemetryMonitor* telemetry_monitor):
+  telemetry_monitor_(telemetry_monitor) {
 }
 
 void ApplicationManagerObserver::OnMessage(utils::SharedPtr<MessageMetric> metric) {
   ApplicationManagerMetricWrapper* m = new ApplicationManagerMetricWrapper();
   m->message_metric = metric;
   m->grabResources();
-  time_manager_->SendMetric(m);
+  telemetry_monitor_->SendMetric(m);
 }
-}  // namespace time_tester
+}  // namespace telemetry_monitor
diff --git a/src/components/time_tester/src/metric_wrapper.cc b/src/components/telemetry_monitor/src/metric_wrapper.cc
index 922a1c849e..2803921501 100644
--- a/src/components/time_tester/src/metric_wrapper.cc
+++ b/src/components/telemetry_monitor/src/metric_wrapper.cc
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "time_tester/metric_wrapper.h"
-#include "time_tester/json_keys.h"
+#include "telemetry_monitor/metric_wrapper.h"
+#include "telemetry_monitor/json_keys.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
   MetricWrapper::MetricWrapper():
     resources(NULL) {
diff --git a/src/components/time_tester/src/protocol_handler_metric.cc b/src/components/telemetry_monitor/src/protocol_handler_metric.cc
index fd351c589f..35beb3e1f7 100644
--- a/src/components/time_tester/src/protocol_handler_metric.cc
+++ b/src/components/telemetry_monitor/src/protocol_handler_metric.cc
@@ -30,11 +30,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "time_tester/protocol_handler_metric.h"
+#include "telemetry_monitor/protocol_handler_metric.h"
 #include "json/json.h"
-#include "time_tester/json_keys.h"
+#include "telemetry_monitor/json_keys.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 Json::Value ProtocolHandlerMecticWrapper::GetJsonMetric() {
   Json::Value result = MetricWrapper::GetJsonMetric();
@@ -48,4 +48,4 @@ Json::Value ProtocolHandlerMecticWrapper::GetJsonMetric() {
   return result;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
diff --git a/src/components/time_tester/src/protocol_handler_observer.cc b/src/components/telemetry_monitor/src/protocol_handler_observer.cc
index d3075c252c..c65e20121f 100644
--- a/src/components/time_tester/src/protocol_handler_observer.cc
+++ b/src/components/telemetry_monitor/src/protocol_handler_observer.cc
@@ -31,16 +31,16 @@
  */
 
 #include "utils/date_time.h"
-#include "time_tester/protocol_handler_observer.h"
-#include "time_tester/protocol_handler_metric.h"
-#include "time_tester/time_manager.h"
+#include "telemetry_monitor/protocol_handler_observer.h"
+#include "telemetry_monitor/protocol_handler_metric.h"
+#include "telemetry_monitor/telemetry_monitor.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "TimeManager")
+CREATE_LOGGERPTR_GLOBAL(logger_, "TelemetryMonitor")
 
-ProtocolHandlerObserver::ProtocolHandlerObserver(TimeManager *time_manager):
-  time_manager_(time_manager) {
+ProtocolHandlerObserver::ProtocolHandlerObserver(TelemetryMonitor *telemetry_monitor):
+  telemetry_monitor_(telemetry_monitor) {
 }
 
 void ProtocolHandlerObserver::StartMessageProcess(uint32_t message_id,
@@ -68,6 +68,6 @@ void ProtocolHandlerObserver::EndMessageProcess(utils::SharedPtr<MessageMetric>
   ProtocolHandlerMecticWrapper* metric = new ProtocolHandlerMecticWrapper();
   metric->message_metric = m;
   metric->grabResources();
-  time_manager_->SendMetric(metric);
+  telemetry_monitor_->SendMetric(metric);
 }
-}  // namespace time_tester
+}  // namespace telemetry_monitor
diff --git a/src/components/time_tester/src/time_manager.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc
index c81c8f51fb..7a697cb309 100644
--- a/src/components/time_tester/src/time_manager.cc
+++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "time_tester/time_manager.h"
+#include "telemetry_monitor/telemetry_monitor.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -41,14 +41,17 @@
 #include <unistd.h>
 
 #include "transport_manager/transport_manager_default.h"
-#include "config_profile/profile.h"
 #include "utils/resource_usage.h"
+#include "telemetry_monitor/telemetry_observable.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "TimeManager")
+CREATE_LOGGERPTR_GLOBAL(logger_, "TelemetryMonitor")
 
-TimeManager::TimeManager():
+TelemetryMonitor::TelemetryMonitor(const std::string& server_address,
+                                   uint16_t port):
+  server_address_(server_address),
+  port_(port),
   thread_(NULL),
   streamer_(NULL),
   app_observer(this),
@@ -57,14 +60,12 @@ TimeManager::TimeManager():
 
 }
 
-void TimeManager::Start() {
-  ip_ = profile::Profile::instance()->server_address();
-  port_ = profile::Profile::instance()->time_testing_port();
+void TelemetryMonitor::Start() {
   streamer_ = new Streamer(this);
-  thread_ = threads::CreateThread("TimeManager", streamer_ );
+  thread_ = threads::CreateThread("TelemetryMonitor", streamer_ );
 }
 
-void TimeManager::set_streamer(Streamer* streamer) {
+void TelemetryMonitor::set_streamer(Streamer* streamer) {
   LOG4CXX_AUTO_TRACE(logger_);
   if (thread_ && !thread_->is_running()) {
     thread_->set_delegate(streamer);
@@ -77,36 +78,37 @@ void TimeManager::set_streamer(Streamer* streamer) {
   }
 }
 
-const std::string& TimeManager::ip() const  {
-  return ip_;
+const std::string& TelemetryMonitor::ip() const  {
+  return server_address_;
 }
 
-int16_t TimeManager::port() const {
+int16_t TelemetryMonitor::port() const {
   return port_;
 }
 
-TimeManager::~TimeManager() {
+TelemetryMonitor::~TelemetryMonitor() {
   Stop();
 }
 
-void TimeManager::Init(protocol_handler::ProtocolHandlerImpl* ph) {
+void TelemetryMonitor::Init(
+    TelemetryObservable<protocol_handler::PHTelemetryObserver>*
+        protocol_handler,
+    TelemetryObservable<application_manager::AMTelemetryObserver>*
+        app_manager,
+    TelemetryObservable<transport_manager::TMTelemetryObserver>*
+        transport_manager) {
   LOG4CXX_AUTO_TRACE(logger_);
-  DCHECK_OR_RETURN_VOID(ph);
   DCHECK_OR_RETURN_VOID(streamer_);
 
-  application_manager::ApplicationManagerImpl::instance()->SetTimeMetricObserver(&app_observer);
-  transport_manager::TransportManagerDefault::instance()->SetTimeMetricObserver(&tm_observer);
-  ph->SetTimeMetricObserver(&ph_observer);
-  if (thread_) {
-    thread_->start(threads::ThreadOptions());
-  }
-  else
-  {
-    LOG4CXX_WARN(logger_,"Thread does not initialized");
-  }
+  app_manager->SetTelemetryObserver(&app_observer);
+  transport_manager->SetTelemetryObserver(&tm_observer);
+  protocol_handler->SetTelemetryObserver(&ph_observer);
+
+  DCHECK_OR_RETURN_VOID(thread_);
+  thread_->start(threads::ThreadOptions());
 }
 
-void TimeManager::Stop() {
+void TelemetryMonitor::Stop() {
   LOG4CXX_AUTO_TRACE(logger_);
   if (thread_) {
     thread_->stop();
@@ -116,13 +118,13 @@ void TimeManager::Stop() {
   thread_ = NULL;
 }
 
-void TimeManager::SendMetric(utils::SharedPtr<MetricWrapper> metric) {
+void TelemetryMonitor::SendMetric(utils::SharedPtr<MetricWrapper> metric) {
   if ((NULL != streamer_ )&& streamer_->is_client_connected_) {
     streamer_->PushMessage(metric);
   }
 }
 
-Streamer::Streamer(TimeManager* const server)
+Streamer::Streamer(TelemetryMonitor* const server)
   : is_client_connected_(false),
     kserver_(server),
     server_socket_fd_(0),
@@ -283,4 +285,4 @@ bool Streamer::Send(const std::string& msg) {
 void Streamer::PushMessage(utils::SharedPtr<MetricWrapper> metric) {
   messages_.push(metric);
 }
-}  // namespace time_tester
+}  // namespace telemetry_monitor
diff --git a/src/components/time_tester/src/transport_manager_metric.cc b/src/components/telemetry_monitor/src/transport_manager_metric.cc
index dd707d7fd3..2e62a63797 100644
--- a/src/components/time_tester/src/transport_manager_metric.cc
+++ b/src/components/telemetry_monitor/src/transport_manager_metric.cc
@@ -30,12 +30,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "time_tester/transport_manager_metric.h"
+#include "telemetry_monitor/transport_manager_metric.h"
 #include "json/json.h"
-#include "time_tester/json_keys.h"
+#include "telemetry_monitor/json_keys.h"
 #include "application_manager/smart_object_keys.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
 Json::Value TransportManagerMecticWrapper::GetJsonMetric() {
   Json::Value result = MetricWrapper::GetJsonMetric();
@@ -48,4 +48,4 @@ Json::Value TransportManagerMecticWrapper::GetJsonMetric() {
   return result;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
diff --git a/src/components/time_tester/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc
index 49f95e9fa9..b74bc55b55 100644
--- a/src/components/time_tester/src/transport_manager_observer.cc
+++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc
@@ -29,17 +29,17 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include "time_tester/transport_manager_observer.h"
+#include "telemetry_monitor/transport_manager_observer.h"
 
 #include <time.h>
 
-#include "time_tester/transport_manager_metric.h"
-#include "time_tester/time_manager.h"
+#include "telemetry_monitor/transport_manager_metric.h"
+#include "telemetry_monitor/telemetry_monitor.h"
 
-namespace time_tester {
+namespace telemetry_monitor {
 
-TransportManagerObserver::TransportManagerObserver(TimeManager* time_manager):
-  time_manager_ (time_manager) {
+TransportManagerObserver::TransportManagerObserver(TelemetryMonitor* telemetry_monitor):
+  telemetry_monitor_ (telemetry_monitor) {
 }
 
 void TransportManagerObserver::StartRawMsg(const protocol_handler::RawMessage* ptr) {
@@ -51,13 +51,13 @@ void TransportManagerObserver::StopRawMsg(const protocol_handler::RawMessage* pt
     it = time_starts.find(ptr);
     if (it != time_starts.end()) {
       TransportManagerMecticWrapper* m = new TransportManagerMecticWrapper();
-      m->message_metric = new transport_manager::TMMetricObserver::MessageMetric();
+      m->message_metric = new transport_manager::TMTelemetryObserver::MessageMetric();
       m->message_metric->begin = it->second;
       m->message_metric->end = date_time::DateTime::getCurrentTime();
       m->message_metric->data_size = ptr->data_size();
       m->grabResources();
-      time_manager_->SendMetric(m);
+      telemetry_monitor_->SendMetric(m);
     }
 }
 
-} //namespace time_tester
+} //namespace telemetry_monitor
diff --git a/src/components/time_tester/test/CMakeLists.txt b/src/components/telemetry_monitor/test/CMakeLists.txt
index 360d85239d..f574621828 100644
--- a/src/components/time_tester/test/CMakeLists.txt
+++ b/src/components/telemetry_monitor/test/CMakeLists.txt
@@ -30,22 +30,19 @@
 
 if(BUILD_TESTS)
 
-include_directories (
-  ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/include
-  ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/gtest/include
-  ${COMPONENTS_DIR}/include/utils
-  ${COMPONENTS_DIR}/include/protocol_handler
-  ${COMPONENTS_DIR}/time_tester/include
+include_directories(
+  include
+  ${GMOCK_INCLUDE_DIRECTORY}
+  ${COMPONENTS_DIR}/telemetry_monitor/include
   ${COMPONENTS_DIR}/utils/include
   ${COMPONENTS_DIR}/protocol_handler/include
   ${COMPONENTS_DIR}/application_manager/include
-  ${COMPONENTS_DIR}/protocol_handler/test
-  )
+)
   
 
 set(testSources
   metric_wrapper_test.cc
-  time_manager_test.cc
+  telemetry_monitor_test.cc
   protocol_handler_metric_test.cc
   protocol_handler_observer_test.cc
   transport_manager_metric_test.cc
@@ -56,7 +53,7 @@ set(testSources
 
 set(testLibraries
   gmock
-  TimeTester
+  TelemetryMonitor
   jsoncpp
   Utils
   MediaManager
@@ -85,6 +82,6 @@ endif()
 
 file(COPY log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-create_test("time_tester_test" "${testSources}" "${testLibraries}")
+create_test("telemetry_monitor_test" "${testSources}" "${testLibraries}")
 
 endif()
diff --git a/src/components/time_tester/test/application_manager_metric_test.cc b/src/components/telemetry_monitor/test/application_manager_metric_test.cc
index 7d09cc85c9..0ec23ccda0 100644
--- a/src/components/time_tester/test/application_manager_metric_test.cc
+++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc
@@ -31,16 +31,16 @@
  */
 
 #include "gtest/gtest.h"
-#include "json_keys.h"
+#include "telemetry_monitor/json_keys.h"
 #include "utils/resource_usage.h"
 #include "application_manager/smart_object_keys.h"
-#include "application_manager_metric.h"
+#include "telemetry_monitor/application_manager_metric.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace ::time_tester;
+using namespace ::telemetry_monitor;
 
 TEST(ApplicationManagerMetricWrapper, grabResources) {
   ApplicationManagerMetricWrapper metric_test;
@@ -57,7 +57,7 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new application_manager::AMMetricObserver::MessageMetric();
+  metric_test.message_metric = new application_manager::AMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   NsSmartDeviceLink::NsSmartObjects::SmartObject obj;
@@ -66,14 +66,14 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetric) {
   metric_test.message_metric->message = new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
   Json::Value jvalue = metric_test.GetJsonMetric();
 
-  EXPECT_EQ("null\n", jvalue[time_tester::strings::stime].toStyledString());
-  EXPECT_EQ("null\n", jvalue[time_tester::strings::utime].toStyledString());
-  EXPECT_EQ("null\n", jvalue[time_tester::strings::memory].toStyledString());
+  EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::stime].toStyledString());
+  EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::utime].toStyledString());
+  EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::memory].toStyledString());
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[time_tester::strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[time_tester::strings::end].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[time_tester::strings::correlation_id].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[time_tester::strings::connection_key].asInt());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[telemetry_monitor::strings::correlation_id].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[telemetry_monitor::strings::connection_key].asInt());
 }
 
 TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) {
@@ -89,7 +89,7 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
 
-  metric_test.message_metric = new application_manager::AMMetricObserver::MessageMetric();
+  metric_test.message_metric = new application_manager::AMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   NsSmartDeviceLink::NsSmartObjects::SmartObject obj;
@@ -98,21 +98,21 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   metric_test.message_metric->message = new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
   Json::Value jvalue = metric_test.GetJsonMetric();
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[time_tester::strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[time_tester::strings::end].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[time_tester::strings::correlation_id].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[time_tester::strings::connection_key].asInt());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[telemetry_monitor::strings::correlation_id].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[telemetry_monitor::strings::connection_key].asInt());
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[time_tester::strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[time_tester::strings::end].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64());
 
-  EXPECT_NEAR(resources->stime, jvalue[time_tester::strings::stime].asInt(),1);
-  EXPECT_NEAR(resources->utime, jvalue[time_tester::strings::utime].asInt(),1);
-  EXPECT_EQ(resources->memory, jvalue[time_tester::strings::memory].asInt());
+  EXPECT_NEAR(resources->stime, jvalue[telemetry_monitor::strings::stime].asInt(),1);
+  EXPECT_NEAR(resources->utime, jvalue[telemetry_monitor::strings::utime].asInt(),1);
+  EXPECT_EQ(resources->memory, jvalue[telemetry_monitor::strings::memory].asInt());
 
   delete resources;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
 }  // namespace components
 }  // namespace test
diff --git a/src/components/time_tester/test/application_manager_observer_test.cc b/src/components/telemetry_monitor/test/application_manager_observer_test.cc
index 3132ba3392..9ca0850c15 100644
--- a/src/components/time_tester/test/application_manager_observer_test.cc
+++ b/src/components/telemetry_monitor/test/application_manager_observer_test.cc
@@ -31,29 +31,29 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/time_manager_mock.h"
-#include "application_manager/time_metric_observer.h"
-#include "application_manager_metric.h"
-#include "application_manager_observer.h"
+#include "telemetry_monitor/mock_telemetry_monitor.h"
+#include "application_manager/telemetry_observer.h"
+#include "telemetry_monitor/application_manager_metric.h"
+#include "telemetry_monitor/application_manager_observer.h"
 #include "utils/shared_ptr.h"
-#include "time_manager.h"
+#include "telemetry_monitor/telemetry_monitor.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace time_tester;
+using namespace telemetry_monitor;
 using ::testing::_;
 
 TEST(ApplicationManagerObserver, CallOnMessage) {
-  TimeManagerMock time_manager_mock;
-  ApplicationManagerObserver app_observer(&time_manager_mock);
-  typedef application_manager::AMMetricObserver::MessageMetric AMMetric;
-  utils::SharedPtr<AMMetric> ptr = application_manager::AMMetricObserver::MessageMetricSharedPtr();
-  EXPECT_CALL(time_manager_mock, SendMetric(_));
+  MockTelemetryMonitor mock_telemetry_monitor;
+  ApplicationManagerObserver app_observer(&mock_telemetry_monitor);
+  typedef application_manager::AMTelemetryObserver::MessageMetric AMMetric;
+  utils::SharedPtr<AMMetric> ptr = application_manager::AMTelemetryObserver::MessageMetricSharedPtr();
+  EXPECT_CALL(mock_telemetry_monitor, SendMetric(_));
   app_observer.OnMessage(ptr);
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
 }  // namespace components
 }  // namespace test
diff --git a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h
new file mode 100644
index 0000000000..2d849a634c
--- /dev/null
+++ b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_MOCK_TELEMETRY_MONITOR_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_MOCK_TELEMETRY_MONITOR_H_
+
+#include <string>
+#include "gmock/gmock.h"
+#include "telemetry_monitor/telemetry_monitor.h"
+#include "telemetry_monitor/metric_wrapper.h"
+#include "utils/shared_ptr.h"
+
+namespace test {
+namespace components {
+namespace telemetry_monitor_test {
+
+class MockTelemetryMonitor: public telemetry_monitor::TelemetryMonitor {
+ public:
+  MockTelemetryMonitor():telemetry_monitor::TelemetryMonitor("",0u){}
+  MOCK_METHOD1(Init, void(protocol_handler::ProtocolHandlerImpl* ph));
+  MOCK_METHOD0(Stop, void());
+  MOCK_METHOD0(Start, void());
+  MOCK_METHOD1(SendMetric,
+               void(utils::SharedPtr<telemetry_monitor::MetricWrapper> metric));
+};
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_MOCK_TELEMETRY_MONITOR_H_
diff --git a/src/components/time_tester/test/log4cxx.properties b/src/components/telemetry_monitor/test/log4cxx.properties
index 68adbfa7f3..68adbfa7f3 100644
--- a/src/components/time_tester/test/log4cxx.properties
+++ b/src/components/telemetry_monitor/test/log4cxx.properties
diff --git a/src/components/time_tester/test/metric_wrapper_test.cc b/src/components/telemetry_monitor/test/metric_wrapper_test.cc
index 5eddf0fb62..08b9747742 100644
--- a/src/components/time_tester/test/metric_wrapper_test.cc
+++ b/src/components/telemetry_monitor/test/metric_wrapper_test.cc
@@ -31,16 +31,16 @@
  */
 
 #include "gtest/gtest.h"
-#include "metric_wrapper.h"
-#include "json_keys.h"
+#include "telemetry_monitor/metric_wrapper.h"
+#include "telemetry_monitor/json_keys.h"
 #include "json/json.h"
 #include "utils/resource_usage.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace ::time_tester;
+using namespace ::telemetry_monitor;
 
 TEST(MetricWrapper, grabResources) {
   MetricWrapper metric_test;
@@ -77,6 +77,6 @@ TEST(MetricWrapper, GetJsonMetricWithGrabResources) {
   delete resources;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
 }  // namespace components
 }  // namespace test
diff --git a/src/components/time_tester/test/protocol_handler_metric_test.cc b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc
index 150e1205fe..d74244a97f 100644
--- a/src/components/time_tester/test/protocol_handler_metric_test.cc
+++ b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc
@@ -31,17 +31,17 @@
  */
 
 #include "gtest/gtest.h"
-#include "json_keys.h"
+#include "telemetry_monitor/json_keys.h"
 #include "json/json.h"
 #include "utils/resource_usage.h"
-#include "protocol_handler_metric.h"
-#include "protocol_handler/time_metric_observer.h"
+#include "telemetry_monitor/protocol_handler_metric.h"
+#include "protocol_handler/telemetry_observer.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace ::time_tester;
+using namespace ::telemetry_monitor;
 
 TEST(ProtocolHandlerMetricTest, grabResources) {
   ProtocolHandlerMecticWrapper metric_test;
@@ -58,7 +58,7 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new protocol_handler::PHMetricObserver::MessageMetric();
+  metric_test.message_metric = new protocol_handler::PHTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   metric_test.message_metric->message_id = 5;
@@ -89,7 +89,7 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetricWithGrabResources) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new protocol_handler::PHMetricObserver::MessageMetric();
+  metric_test.message_metric = new protocol_handler::PHTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   metric_test.message_metric->message_id = 5;
@@ -114,6 +114,6 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetricWithGrabResources) {
   delete resources;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
 }  // namespace components
 }  // namespace test
diff --git a/src/components/time_tester/test/protocol_handler_observer_test.cc b/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc
index 42788aaa06..784e809da6 100644
--- a/src/components/time_tester/test/protocol_handler_observer_test.cc
+++ b/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc
@@ -31,51 +31,51 @@
  */
 
 #include "gtest/gtest.h"
-#include "time_manager.h"
-#include "include/time_manager_mock.h"
-#include "protocol_handler/time_metric_observer.h"
+#include "telemetry_monitor/telemetry_monitor.h"
+#include "telemetry_monitor/mock_telemetry_monitor.h"
+#include "protocol_handler/telemetry_observer.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace time_tester;
+using namespace telemetry_monitor;
 using ::testing::_;
 
 TEST(ProtocolHandlerObserverTest, MessageProcess) {
-  TimeManagerMock time_manager_mock;
+  MockTelemetryMonitor mock_telemetry_monitor;
 
-  ProtocolHandlerObserver pr_handler(&time_manager_mock);
+  ProtocolHandlerObserver pr_handler(&mock_telemetry_monitor);
   uint32_t message_id = 1;
   TimevalStruct start_time;
   start_time.tv_sec = 1;
   start_time.tv_usec = 0;
   pr_handler.StartMessageProcess(message_id, start_time);
 
-  typedef protocol_handler::PHMetricObserver::MessageMetric MetricType;
+  typedef protocol_handler::PHTelemetryObserver::MessageMetric MetricType;
   utils::SharedPtr<MetricType> message_metric = new MetricType();
   message_metric->message_id = 1;
-  EXPECT_CALL(time_manager_mock, SendMetric(_));
+  EXPECT_CALL(mock_telemetry_monitor, SendMetric(_));
   pr_handler.EndMessageProcess(message_metric);
 }
 
 TEST(ProtocolHandlerObserverTest, MessageProcessWithZeroMessageId) {
-  TimeManagerMock time_manager_mock;
+  MockTelemetryMonitor mock_telemetry_monitor;
 
-  ProtocolHandlerObserver pr_handler(&time_manager_mock);
+  ProtocolHandlerObserver pr_handler(&mock_telemetry_monitor);
   uint32_t message_id = 0;
   TimevalStruct start_time;
   start_time.tv_sec = 1;
   start_time.tv_usec = 0;
   pr_handler.StartMessageProcess(message_id, start_time);
 
-  typedef protocol_handler::PHMetricObserver::MessageMetric MetricType;
+  typedef protocol_handler::PHTelemetryObserver::MessageMetric MetricType;
   utils::SharedPtr<MetricType> message_metric = new MetricType();
   message_metric->message_id = 0;
-  EXPECT_CALL(time_manager_mock, SendMetric(_)).Times(0);
+  EXPECT_CALL(mock_telemetry_monitor, SendMetric(_)).Times(0);
   pr_handler.EndMessageProcess(message_metric);
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc
new file mode 100644
index 0000000000..14c7fe4cd5
--- /dev/null
+++ b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2015, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gtest/gtest.h"
+#include "telemetry_monitor/telemetry_monitor.h"
+#include "protocol_handler/telemetry_observer.h"
+#include "protocol_handler/protocol_handler.h"
+#include "protocol_handler//mock_protocol_handler.h"
+#include "protocol_handler/mock_session_observer.h"
+#include "protocol_handler/mock_protocol_handler_settings.h"
+#include "connection_handler/mock_connection_handler.h"
+#include "transport_manager/transport_manager_mock.h"
+#include "telemetry_monitor/mock_telemetry_observable.h"
+
+
+using testing::Return;
+using testing::_;
+
+namespace test {
+namespace components {
+namespace telemetry_monitor_test {
+
+using namespace telemetry_monitor;
+
+class StreamerMock : public Streamer {
+ public:
+  StreamerMock(TelemetryMonitor* const server)
+      : Streamer(server) {
+    is_client_connected_ = true;
+  }
+  MOCK_METHOD1(PushMessage,void(utils::SharedPtr<MetricWrapper> metric));
+};
+
+TEST(TelemetryMonitorTest, MessageProcess) {
+  const std::string& server_address = "server_address";
+  const uint16_t port = 12345;
+  MockTelemetryObservable am_observeble;
+
+   transport_manager_test::MockTransportManager transport_manager_mock;
+   testing::NiceMock<connection_handler_test::MockConnectionHandler>
+       connection_handler_mock;
+  testing::NiceMock<
+      ::test::components::protocol_handler_test::MockProtocolHandlerSettings>
+       protocol_handler_settings_mock;
+   ::test::components::protocol_handler_test::MockSessionObserver
+       session_observer_mock;
+
+  const size_t init_value = 1000u;
+  ON_CALL(protocol_handler_settings_mock, maximum_payload_size())
+      .WillByDefault(Return(init_value));
+  ON_CALL(protocol_handler_settings_mock, message_frequency_time())
+      .WillByDefault(Return(init_value));
+  ON_CALL(protocol_handler_settings_mock, malformed_message_filtering())
+      .WillByDefault(Return(init_value));
+  ON_CALL(protocol_handler_settings_mock, multiframe_waiting_timeout())
+      .WillByDefault(Return(init_value));
+   protocol_handler::ProtocolHandlerImpl protocol_handler_mock(
+      protocol_handler_settings_mock, session_observer_mock,
+      connection_handler_mock, transport_manager_mock);
+
+  EXPECT_CALL(am_observeble, SetTelemetryObserver(_));
+  EXPECT_CALL(transport_manager_mock, SetTelemetryObserver(_));
+  telemetry_monitor::TelemetryMonitor telemetry_monitor(server_address, port);
+  StreamerMock streamer_mock(&telemetry_monitor);
+  telemetry_monitor.Start();
+
+  telemetry_monitor.set_streamer(&streamer_mock);
+  telemetry_monitor.Init(&protocol_handler_mock, &am_observeble,
+                           &transport_manager_mock);
+  utils::SharedPtr<telemetry_monitor::MetricWrapper> test_metric;
+  EXPECT_CALL(streamer_mock, PushMessage(test_metric));
+  telemetry_monitor.SendMetric(test_metric);
+}
+
+}  // namespace telemetry_monitor
+}  // namespace components
+}  // namespace test
diff --git a/src/components/time_tester/test/transport_manager_metric_test.cc b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc
index 2bb09416ed..53d4ed1ba4 100644
--- a/src/components/time_tester/test/transport_manager_metric_test.cc
+++ b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc
@@ -31,17 +31,17 @@
  */
 
 #include "gtest/gtest.h"
-#include "json_keys.h"
+#include "telemetry_monitor/json_keys.h"
 #include "json/json.h"
 #include "utils/resource_usage.h"
-#include "transport_manager_metric.h"
-#include "protocol_handler/time_metric_observer.h"
+#include "telemetry_monitor/transport_manager_metric.h"
+#include "protocol_handler/telemetry_observer.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace ::time_tester;
+using namespace ::telemetry_monitor;
 
 TEST(TransportManagerMetricWrapper, grabResources) {
   TransportManagerMecticWrapper metric_test;
@@ -58,7 +58,7 @@ TEST(TransportManagerMetricWrapper, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new transport_manager::TMMetricObserver::MessageMetric();
+  metric_test.message_metric = new transport_manager::TMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   metric_test.message_metric->data_size = 1000;
@@ -86,7 +86,7 @@ TEST(TransportManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new transport_manager::TMMetricObserver::MessageMetric();
+  metric_test.message_metric = new transport_manager::TMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
 
@@ -105,6 +105,6 @@ TEST(TransportManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   delete resources;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
 }  // namespace components
 }  // namespace test
diff --git a/src/components/time_tester/test/transport_manager_observer_test.cc b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
index be19a79b15..eba786ef70 100644
--- a/src/components/time_tester/test/transport_manager_observer_test.cc
+++ b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
@@ -31,28 +31,28 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/time_manager_mock.h"
-#include "protocol_handler/time_metric_observer.h"
-#include "transport_manager_metric.h"
-#include "transport_manager_observer.h"
+#include "telemetry_monitor/mock_telemetry_monitor.h"
+#include "protocol_handler/telemetry_observer.h"
+#include "telemetry_monitor/transport_manager_metric.h"
+#include "telemetry_monitor/transport_manager_observer.h"
 
 namespace test {
 namespace components {
-namespace time_tester_test {
+namespace telemetry_monitor_test {
 
-using namespace time_tester;
+using namespace telemetry_monitor;
 using ::testing::_;
 
 TEST(TransportManagerObserverTest, MessageProcess) {
-  TimeManagerMock time_manager_mock;
-  TransportManagerObserver tr_observer(&time_manager_mock);
+  MockTelemetryMonitor mock_telemetry_monitor;
+  TransportManagerObserver tr_observer(&mock_telemetry_monitor);
   protocol_handler::RawMessage* ptr = new ::protocol_handler::RawMessage(0, 0, NULL, 0);
   tr_observer.StartRawMsg(ptr);
-  EXPECT_CALL(time_manager_mock, SendMetric(_));
+  EXPECT_CALL(mock_telemetry_monitor, SendMetric(_));
   tr_observer.StopRawMsg(ptr);
   delete ptr;
 }
 
-}  // namespace time_tester
+}  // namespace telemetry_monitor
 }  // namespace components
 }  // namespace test
diff --git a/src/components/time_tester/test/time_manager_test.cc b/src/components/time_tester/test/time_manager_test.cc
deleted file mode 100644
index 1d34656fde..0000000000
--- a/src/components/time_tester/test/time_manager_test.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2015, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gtest/gtest.h"
-#include "time_tester/time_manager.h"
-#include "protocol_handler/time_metric_observer.h"
-#include "protocol_handler/protocol_handler.h"
-#include "protocol_handler//mock_protocol_handler.h"
-#include "protocol_handler/mock_session_observer.h"
-#include "protocol_handler/mock_protocol_handler_settings.h"
-#include "connection_handler/mock_connection_handler.h"
-#include "transport_manager/transport_manager_mock.h"
-
-namespace test {
-namespace components {
-namespace time_tester_test {
-
-using namespace time_tester;
-
-class StreamerMock : public Streamer {
- public:
-  StreamerMock(TimeManager* const server)
-      : Streamer(server) {
-    is_client_connected_ = true;
-  }
-  MOCK_METHOD1(PushMessage,void(utils::SharedPtr<MetricWrapper> metric));
-};
-
-TEST(TimeManagerTest, DISABLED_MessageProcess) {
-  //TODO(AK) APPLINK-13351 Disable due to refactor TimeTester
-  transport_manager_test::TransportManagerMock transport_manager_mock;
-  testing::NiceMock<connection_handler_test::MockConnectionHandler>
-      connection_handler_mock;
-  test::components::protocol_handler_test::MockProtocolHandlerSettings
-      protocol_handler_settings_mock;
-  test::components::protocol_handler_test::MockSessionObserver
-      session_observer_mock;
-  protocol_handler::ProtocolHandlerImpl protocol_handler_mock(protocol_handler_settings_mock,
-                                                              session_observer_mock,
-                                                              connection_handler_mock,
-                                                              transport_manager_mock);
-  TimeManager * time_manager = new TimeManager();
-  // Streamer will be deleted by Thread
-  StreamerMock* streamer_mock = new StreamerMock(time_manager);
-  time_manager->set_streamer(streamer_mock);
-  time_manager->Init(&protocol_handler_mock);
-  utils::SharedPtr<MetricWrapper> test_metric;
-  EXPECT_CALL(*streamer_mock, PushMessage(test_metric));
-  time_manager->SendMetric(test_metric);
-  delete time_manager;
-}
-
-}  // namespace time_tester
-}  // namespace components
-}  // namespace test
diff --git a/src/components/transport_manager/include/transport_manager/time_metric_observer.h b/src/components/transport_manager/include/transport_manager/telemetry_observer.h
index ce59a9b4c4..8fe98a1553 100644
--- a/src/components/transport_manager/include/transport_manager/time_metric_observer.h
+++ b/src/components/transport_manager/include/transport_manager/telemetry_observer.h
@@ -39,7 +39,7 @@
 
 namespace transport_manager {
 
-class TMMetricObserver {
+class TMTelemetryObserver {
  public:
   struct MessageMetric {
     TimevalStruct begin;
@@ -49,7 +49,7 @@ class TMMetricObserver {
   virtual void StartRawMsg(const protocol_handler::RawMessage* ptr) = 0;
   virtual void StopRawMsg(const protocol_handler::RawMessage* ptr) = 0;
 
-  virtual ~TMMetricObserver(){}
+  virtual ~TMTelemetryObserver(){}
 };
 }  // transport_manager
 #endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TIME_METRIC_OBSERVER_H_
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
index b51db9e3a5..0cf28f7a16 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
@@ -46,9 +46,9 @@
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 #include "transport_manager/transport_adapter/connection.h"
 
-#ifdef TIME_TESTER
-#include "transport_manager/time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "transport_manager/telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 
 namespace transport_manager {
 
@@ -398,21 +398,21 @@ class TransportAdapterImpl : public TransportAdapter,
    */
   virtual std::string GetConnectionType() const;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(TMMetricObserver* observer);
+  void SetTelemetryObserver(TMTelemetryObserver* observer);
 
   /**
    * @brief Return Time metric observer
    *
    * @param return pointer to Time metric observer
    */
-  virtual TMMetricObserver* GetTimeMetricObserver();
-#endif  // TIME_TESTER
+  virtual TMTelemetryObserver* GetTelemetryObserver();
+#endif  // TELEMETRY_MONITOR
 
  protected:
   /**
@@ -529,12 +529,12 @@ class TransportAdapterImpl : public TransportAdapter,
   mutable sync_primitives::RWLock connections_lock_;
 
  protected:
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Pointer to time metric observer
    */
-  TMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
+  TMTelemetryObserver* metric_observer_;
+#endif  // TELEMETRY_MONITOR
 
   /**
    * @brief Pointer to the device scanner.
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
index 3a10a8d00f..7d0e2b177d 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
@@ -48,11 +48,12 @@
 #include "transport_manager/transport_manager_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener_impl.h"
 #include "protocol/common.h"
-#ifdef TIME_TESTER
-#include "transport_manager/time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "transport_manager/telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 #include "utils/threads/message_loop_thread.h"
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
+#include "telemetry_monitor/telemetry_observable.h"
 
 namespace transport_manager {
 
@@ -65,9 +66,14 @@ typedef utils::SharedPtr<timer::Timer> TimerSPtr;
 /**
  * @brief Implementation of transport manager.s
  */
-class TransportManagerImpl : public TransportManager,
-                             public RawMessageLoopThread::Handler,
-                             public TransportAdapterEventLoopThread::Handler {
+class TransportManagerImpl
+    : public TransportManager,
+      public RawMessageLoopThread::Handler
+#ifdef TELEMETRY_MONITOR
+      ,
+      public telemetry_monitor::TelemetryObservable<TMTelemetryObserver>
+#endif  // TELEMETRY_MONITOR
+      , public TransportAdapterEventLoopThread::Handler {
  public:
   struct Connection {
     ConnectionUID id;
@@ -219,14 +225,14 @@ class TransportManagerImpl : public TransportManager,
    */
   void UpdateDeviceList(TransportAdapter* ta);
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(TMMetricObserver* observer);
-#endif  // TIME_TESTER
+  void SetTelemetryObserver(TMTelemetryObserver* observer);
+#endif  // TELEMETRY_MONITOR
 
 
   /**
@@ -272,9 +278,9 @@ class TransportManagerImpl : public TransportManager,
    */
   bool is_initialized_;
 
-#ifdef TIME_TESTER
-  TMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+  TMTelemetryObserver* metric_observer_;
+#endif  // TELEMETRY_MONITOR
 
  private:
   /**
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index 84b6166489..2ae8776a3e 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -65,9 +65,9 @@ TransportAdapterImpl::TransportAdapterImpl(
     devices_mutex_(),
     connections_(),
     connections_lock_(),
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     metric_observer_(NULL),
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
     device_scanner_(device_scanner),
     server_connection_factory_(server_connection_factory),
     client_connection_listener_(client_connection_listener) {
@@ -589,11 +589,11 @@ void TransportAdapterImpl::DataReceiveDone(const DeviceUID& device_id,
   LOG4CXX_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " <<
                 &app_handle << ", message: " << message);
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     metric_observer_->StartRawMsg(message.get());
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
   for (TransportAdapterListenerList::iterator it = listeners_.begin();
        it != listeners_.end(); ++it) {
@@ -773,17 +773,17 @@ std::string TransportAdapterImpl::GetConnectionType() const {
   return devicesType[GetDeviceType()];
 }
 
-#ifdef TIME_TESTER
-void TransportAdapterImpl::SetTimeMetricObserver(TMMetricObserver* observer) {
+#ifdef TELEMETRY_MONITOR
+void TransportAdapterImpl::SetTelemetryObserver(TMTelemetryObserver* observer) {
   metric_observer_ = observer;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
-#ifdef TIME_TESTER
-TMMetricObserver* TransportAdapterImpl::GetTimeMetricObserver() {
+#ifdef TELEMETRY_MONITOR
+TMTelemetryObserver* TransportAdapterImpl::GetTelemetryObserver() {
   return metric_observer_;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 void TransportAdapterImpl::Store() const {
 }
diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc
index 835c2c17ed..41e43a1aff 100644
--- a/src/components/transport_manager/src/transport_manager_default.cc
+++ b/src/components/transport_manager/src/transport_manager_default.cc
@@ -64,32 +64,32 @@ int TransportManagerDefault::Init() {
 
   ta = new transport_adapter::BluetoothTransportAdapter;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
-    ta->SetTimeMetricObserver(metric_observer_);
+    ta->SetTelemetryObserver(metric_observer_);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta);
 #endif
 
 
   uint16_t port = profile::Profile::instance()->transport_manager_tcp_adapter_port();
   ta = new transport_adapter::TcpTransportAdapter(port);
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
-    ta->SetTimeMetricObserver(metric_observer_);
+    ta->SetTelemetryObserver(metric_observer_);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta);
 
 
 #if defined(USB_SUPPORT)
   ta = new transport_adapter::UsbAoaAdapter();
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
-    ta->SetTimeMetricObserver(metric_observer_);
+    ta->SetTelemetryObserver(metric_observer_);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta);
 #endif  // USB_SUPPORT
 
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 0745e55583..cbae02d4b3 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -72,9 +72,9 @@ TransportManagerImpl::Connection TransportManagerImpl::convert(
 
 TransportManagerImpl::TransportManagerImpl()
   : is_initialized_(false),
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     metric_observer_(NULL),
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
     connection_id_counter_(0),
     message_queue_("TM MessageQueue", this),
     event_queue_("TM EventQueue", this) {
@@ -304,11 +304,11 @@ int TransportManagerImpl::SendMessageToDevice(const ::protocol_handler::RawMessa
     return E_CONNECTION_IS_TO_SHUTDOWN;
   }
   }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     metric_observer_->StartRawMsg(message.get());
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   this->PostMessage(message);
   LOG4CXX_TRACE(logger_, "exit with E_SUCCESS");
   return E_SUCCESS;
@@ -679,11 +679,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
       break;
     }
     case TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_DONE: {
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
         metric_observer_->StopRawMsg(event.event_data.get());
       }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       sync_primitives::AutoReadLock lock(connections_lock_);
       ConnectionInternal* connection =
           GetConnection(event.device_uid, event.application_id);
@@ -705,11 +705,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
       break;
     }
     case TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_FAIL: {
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
         metric_observer_->StopRawMsg(event.event_data.get());
       }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       {
       sync_primitives::AutoReadLock lock(connections_lock_);
       ConnectionInternal* connection =
@@ -752,11 +752,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
       }
       event.event_data->set_connection_key(connection->id);
       }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
         metric_observer_->StopRawMsg(event.event_data.get());
       }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       RaiseEvent(&TransportManagerListener::OnTMMessageReceived, event.event_data);
       LOG4CXX_DEBUG(logger_, "event_type = ON_RECEIVED_DONE");
       break;
@@ -808,11 +808,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
   LOG4CXX_TRACE(logger_, "exit");
 }
 
-#ifdef TIME_TESTER
-void TransportManagerImpl::SetTimeMetricObserver(TMMetricObserver* observer) {
+#ifdef TELEMETRY_MONITOR
+void TransportManagerImpl::SetTelemetryObserver(TMTelemetryObserver* observer) {
   metric_observer_ = observer;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 void TransportManagerImpl::Handle(::protocol_handler::RawMessagePtr msg) {
   LOG4CXX_TRACE(logger_, "enter");
diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt
index 5a149f3063..251877cfd4 100644
--- a/src/components/transport_manager/test/CMakeLists.txt
+++ b/src/components/transport_manager/test/CMakeLists.txt
@@ -32,12 +32,12 @@ if(BUILD_TESTS)
 set(TM_TEST_DIR ${COMPONENTS_DIR}/transport_manager/test)
 
 include_directories(
+  include
   ${LOG4CXX_INCLUDE_DIRECTORY}
   ${GMOCK_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}/smart_objects/include
   ${COMPONENTS_DIR}/transport_manager/include
   ${COMPONENTS_DIR}/utils/include
-  ${COMPONENTS_DIR}/include
   ${COMPONENTS_DIR}/connection_handler/include
   ${JSONCPP_INCLUDE_DIRECTORY}
   ${CMAKE_BINARY_DIR}
diff --git a/src/components/transport_manager/test/include/time_metric_observer_mock.h b/src/components/transport_manager/test/include/mock_telemetry_observer.h
index 5936f8c655..e2c41f658e 100644
--- a/src/components/transport_manager/test/include/time_metric_observer_mock.h
+++ b/src/components/transport_manager/test/include/mock_telemetry_observer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Ford Motor Company
+ * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,26 +30,26 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TIME_METRIC_OBSERVER_MOCK_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TIME_METRIC_OBSERVER_MOCK_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TEST_MOCK_TELEMETRY_OBSERVER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TEST_MOCK_TELEMETRY_OBSERVER_H_
 
-#include <string>
 #include "gmock/gmock.h"
-#include "transport_manager/time_metric_observer.h"
-#include "protocol/raw_message.h"
+#include "transport_manager/telemetry_observer.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
-class TMMetricObserverMock: public ::transport_manager::TMMetricObserver {
+class MockTMTelemetryObserver
+    : public ::transport_manager::TMTelemetryObserver {
  public:
   MOCK_METHOD1(StartRawMsg,
-               void(const protocol_handler::RawMessage* ptr));
+      void(const protocol_handler::RawMessage* ptr));
   MOCK_METHOD1(StopRawMsg,
-               void(const protocol_handler::RawMessage* ptr));
+      void(const protocol_handler::RawMessage* ptr));
 };
-}  // namespace transport_manager_test
-}  // namespace components
-}  // namespace test
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TIME_METRIC_OBSERVER_MOCK_H_
+
+}  // transport_manager_test
+}  // components
+}  // test
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TEST_MOCK_TELEMETRY_OBSERVER_H_
diff --git a/src/components/transport_manager/test/include/transport_adapter_mock.h b/src/components/transport_manager/test/include/transport_adapter_mock.h
index 86e044d13b..599cec29df 100644
--- a/src/components/transport_manager/test/include/transport_adapter_mock.h
+++ b/src/components/transport_manager/test/include/transport_adapter_mock.h
@@ -92,9 +92,9 @@ class TransportAdapterMock
       DeviceName,
       std::string(const ::transport_manager::DeviceUID& device_handle));
 
-#ifdef TIME_TESTER
-  MOCK_METHOD0(GetTimeMetricObserver, ::transport_manager::TMMetricObserver*());
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+  MOCK_METHOD0(GetTelemetryObserver, ::transport_manager::TMTelemetryObserver*());
+#endif  // TELEMETRY_MONITOR
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc
index c5cca9ea2d..918304772a 100644
--- a/src/components/transport_manager/test/transport_adapter_listener_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc
@@ -52,7 +52,7 @@ class TransportAdapterListenerTest : public ::testing::Test {
  protected:
   const int app_handle;
   const std::string dev_id;
-  TransportManagerMock tr_mock;
+  MockTransportManager tr_mock;
   TransportAdapterMock adapter_mock;
   TransportAdapterListenerImpl transport_listener;
 };
diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc
index bf30f92675..fea2cf3c0a 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -38,7 +38,7 @@
 #include "include/transport_adapter_mock.h"
 #include "include/transport_manager_listener_mock.h"
 #include "include/transport_adapter_listener_mock.h"
-#include "include/time_metric_observer_mock.h"
+#include "include/mock_telemetry_observer.h"
 
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
 
@@ -442,8 +442,8 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendingFailed) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_metric_observer, StartRawMsg(_));
 
   EXPECT_CALL(*mock_adapter,
@@ -463,8 +463,8 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_StartTimeObserver) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_adapter,
               SendData(mac_address_, application_id, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
@@ -479,8 +479,8 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendDone) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_adapter,
               SendData(mac_address_, application_id, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
@@ -499,8 +499,8 @@ TEST_F(TransportManagerImplTest, SendMessageFailed_GetHandleSendFailed) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_metric_observer, StartRawMsg(_));
 
   EXPECT_CALL(*mock_adapter,