diff --git a/labs/vertx-akka/src/main/scala/org/bigbluebutton/ClientManager.scala b/labs/vertx-akka/src/main/scala/org/bigbluebutton/ClientManager.scala
index 9f8e0b3fdfc52c6d2d63330929c28b4c78bda1ce..737c2c26e386ac50de8450a29edf77887a0ee5d0 100755
--- a/labs/vertx-akka/src/main/scala/org/bigbluebutton/ClientManager.scala
+++ b/labs/vertx-akka/src/main/scala/org/bigbluebutton/ClientManager.scala
@@ -1,6 +1,6 @@
 package org.bigbluebutton
 
-import akka.actor.{Actor, ActorLogging, ActorSystem, Props}
+import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
 import org.bigbluebutton.client.bus.FromConnEventBus
 import org.bigbluebutton.client.Client
 
diff --git a/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/ClientActor.scala b/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/ClientActor.scala
index 0b74019b0b9bc9a4df0830ce4b24073f408984de..8ddab725d4e4765c38d4450183d7bf21aaf8acaa 100755
--- a/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/ClientActor.scala
+++ b/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/ClientActor.scala
@@ -1,11 +1,10 @@
 package org.bigbluebutton.client
 
-import akka.actor.{Actor, ActorContext, ActorLogging, Props}
+import akka.actor.{ Actor, ActorContext, ActorLogging, Props }
 import org.bigbluebutton.client.bus.FromConnEventBus
 
 object Client {
-  def apply(clientId: String, connEventBus: FromConnEventBus)(implicit context: ActorContext): Client
-      = new Client(clientId, connEventBus)(context)
+  def apply(clientId: String, connEventBus: FromConnEventBus)(implicit context: ActorContext): Client = new Client(clientId, connEventBus)(context)
 }
 
 class Client(val clientId: String, connEventBus: FromConnEventBus)(implicit val context: ActorContext) {
diff --git a/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/FromConnEventBus.scala b/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/FromConnEventBus.scala
index 6bcb3db69160579d3586944e4b09a391796b6a10..48ff2ed4c9f80d1aabf8bfbb73a3f152349a1bf1 100755
--- a/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/FromConnEventBus.scala
+++ b/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/FromConnEventBus.scala
@@ -7,8 +7,8 @@ import org.bigbluebutton.client.ConnInfo
 case class ConnInfo2(id: String)
 
 sealed trait FromConnMsg
-case class ConnectMsg(connInfo: ConnInfo2) extends FromConnMsg
-case class DisconnectMsg(connInfo: ConnInfo2) extends FromConnMsg
+case class ConnectMsg2(connInfo: ConnInfo2) extends FromConnMsg
+case class DisconnectMsg2(connInfo: ConnInfo2) extends FromConnMsg
 case class MsgFromConnMsg(connInfo: ConnInfo2, json: String) extends FromConnMsg
 case class MsgFromConnBusMsg(val topic: String, val payload: FromConnMsg)
 
diff --git a/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/MsgFromClientEventBus.scala b/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/MsgFromClientEventBus.scala
index 5dd2aa7432b4f6632c442a9d37bde535b87bbc52..aa0288cb1d8419ebf15ffd2569f27d53f24974c4 100755
--- a/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/MsgFromClientEventBus.scala
+++ b/labs/vertx-akka/src/main/scala/org/bigbluebutton/client/bus/MsgFromClientEventBus.scala
@@ -5,10 +5,10 @@ import akka.event.{ EventBus, LookupClassification }
 import org.bigbluebutton.client.ConnInfo
 
 sealed trait FromConnectionMsg
-case class ConnectMsg(connInfo: ConnInfo) extends FromConnMsg
-case class DisconnectMsg(connInfo: ConnInfo) extends FromConnMsg
-case class MsgFromClientMsg(connInfo: ConnInfo, json: String) extends FromConnMsg
-case class MsgFromClientBusMsg(val topic: String, val payload: FromConnMsg)
+case class ConnectMsg(connInfo: ConnInfo) extends FromConnectionMsg
+case class DisconnectMsg(connInfo: ConnInfo) extends FromConnectionMsg
+case class MsgFromClientMsg(connInfo: ConnInfo, json: String) extends FromConnectionMsg
+case class MsgFromClientBusMsg(val topic: String, val payload: FromConnectionMsg)
 
 class MsgFromClientEventBus extends EventBus with LookupClassification {
   type Event = MsgFromClientBusMsg