Index: unittests/unittests.h
===================================================================
diff -u -rfee7fabf49befb065c89248c19e15efc9ca194e4 -rd3f98384e9400f8acb84c88dee75f1c480986998
--- unittests/unittests.h	(.../unittests.h)	(revision fee7fabf49befb065c89248c19e15efc9ca194e4)
+++ unittests/unittests.h	(.../unittests.h)	(revision d3f98384e9400f8acb84c88dee75f1c480986998)
@@ -36,14 +36,14 @@
     void tst_CanInterface_Connect_Error_Type() {}
     void tst_CanInterface_Connect_NoError();
 
-    void tst_MessageHandler_Init();
+    void tst_FrameInterface_Init();
 
-    void tst_MessageHandler_ActionPerform_PowerOff_Accepted();
-    void tst_MessageHandler_ActionPerform_PowerOff_Rejected();
-    void tst_MessageHandler_ActionPerform_Unknown();
-    void tst_MessageHandler_ActionRequest_PowerOff();
-    void tst_MessageHandler_ActionRequest_Unknown();
-    void tst_MessageHandler_ActionCommand_PowerOff();
+    void tst_FrameInterface_ActionPerform_PowerOff_Accepted();
+    void tst_FrameInterface_ActionPerform_PowerOff_Rejected();
+    void tst_FrameInterface_ActionPerform_Unknown();
+    void tst_FrameInterface_ActionRequest_PowerOff();
+    void tst_FrameInterface_ActionRequest_Unknown();
+    void tst_FrameInterface_ActionCommand_PowerOff();
 
     void cleanup();
     void cleanupTestCase();