diff --git a/solvable/src/pipe_io_main.py b/solvable/src/pipe_io_main.py
index 61fb547..f39fabd 100644
--- a/solvable/src/pipe_io_main.py
+++ b/solvable/src/pipe_io_main.py
@@ -6,7 +6,7 @@ from tfw import EventHandlerBase
 from tfw.components import PipeIOEventHandler
 
 from pipe_io_auxlib import (
-        MsgSignPipeIOEventHandler, MsgVerifyPipeIOEventHandler,
+        SignMessagePipeIOEventHandler, VerifyMessagePipeIOEventHandler,
         DeployPipeIOEventHandler, IdePipeIOEventHandler,
         FSMPipeIOEventHandler
 )
@@ -31,13 +31,13 @@ if __name__ == '__main__':
         permissions=0o666
     )
 
-    sign_pipe = MsgSignPipeIOEventHandler(
+    sign_pipe = SignMessagePipeIOEventHandler(
         '/tmp/tfw_sign_send',
         '/tmp/tfw_sign_recv',
         forwarding=True
     )
 
-    verify_pipe = MsgVerifyPipeIOEventHandler(
+    verify_pipe = VerifyMessagePipeIOEventHandler(
         '/tmp/tfw_verify_send',
         '/tmp/tfw_verify_recv'
     )