diff --git a/src/Core/Message.php b/src/Core/Message.php
index c04435f..2809cbe 100644
--- a/src/Core/Message.php
+++ b/src/Core/Message.php
@@ -7,7 +7,7 @@ namespace Clivern\Imap\Core;
 
 use Clivern\Imap\Core\Connection;
 use Clivern\Imap\Core\Message\Header;
-use Clivern\Imap\Core\Message\Actions;
+use Clivern\Imap\Core\Message\Action;
 use Clivern\Imap\Core\Message\Attachment;
 use Clivern\Imap\Core\Message\Body;
 
@@ -29,9 +29,9 @@ class Message
     protected $header;
 
     /**
-     * @var Actions
+     * @var Action
      */
-    protected $actions;
+    protected $action;
 
     /**
      * @var array
@@ -58,11 +58,11 @@ class Message
      *
      * @param Connection $connection
      */
-    public function __construct(Connection $connection, Header $header, Actions $actions, Body $body)
+    public function __construct(Connection $connection, Header $header, Action $action, Body $body)
     {
         $this->connection = $connection;
         $this->header = $header;
-        $this->actions = $actions;
+        $this->action = $action;
         $this->body = $body;
     }
 
@@ -141,13 +141,13 @@ class Message
     }
 
     /**
-     * Get Message Actions Object
+     * Get Message Action Object
      *
-     * @return Actions
+     * @return Action
      */
-    public function actions()
+    public function action()
     {
-        return $this->actions->config($this->msg_number, $this->uid);
+        return $this->action->config($this->msg_number, $this->uid);
     }
 
     /**
diff --git a/src/Core/Message/Actions.php b/src/Core/Message/Action.php
similarity index 94%
rename from src/Core/Message/Actions.php
rename to src/Core/Message/Action.php
index 873d379..3db6af5 100644
--- a/src/Core/Message/Actions.php
+++ b/src/Core/Message/Action.php
@@ -8,11 +8,11 @@ namespace Clivern\Imap\Core\Message;
 use Clivern\Imap\Core\Connection;
 
 /**
- * Actions Class
+ * Action Class
  *
  * @package Clivern\Imap\Core\Message
  */
-class Actions
+class Action
 {
 
     /**
@@ -46,7 +46,7 @@ class Actions
      *
      * @param integer $message_number
      * @param integer $message_uid
-     * @return Actions
+     * @return Action
      */
     public function config($message_number, $message_uid)
     {
diff --git a/src/Core/MessageIterator.php b/src/Core/MessageIterator.php
index b8effa1..515c6cd 100644
--- a/src/Core/MessageIterator.php
+++ b/src/Core/MessageIterator.php
@@ -8,7 +8,7 @@ namespace Clivern\Imap\Core;
 use Clivern\Imap\Core\Message;
 use Clivern\Imap\Core\Connection;
 use Clivern\Imap\Core\Message\Header;
-use Clivern\Imap\Core\Message\Actions;
+use Clivern\Imap\Core\Message\Action;
 use Clivern\Imap\Core\Message\Body;
 
 /**
@@ -43,7 +43,7 @@ class MessageIterator extends \ArrayIterator
      */
     public function current()
     {
-        $message = new Message($this->connection, new Header($this->connection), new Actions($this->connection), new Body($this->connection));
+        $message = new Message($this->connection, new Header($this->connection), new Action($this->connection), new Body($this->connection));
         return $message->setUid(parent::current())->config();
     }
 }
\ No newline at end of file
diff --git a/src/MailBox.php b/src/MailBox.php
index 001cbf7..b45e971 100644
--- a/src/MailBox.php
+++ b/src/MailBox.php
@@ -10,7 +10,7 @@ use Clivern\Imap\Core\MessageIterator;
 use Clivern\Imap\Core\Message;
 use Clivern\Imap\Core\Search;
 use Clivern\Imap\Core\Message\Header;
-use Clivern\Imap\Core\Message\Actions;
+use Clivern\Imap\Core\Message\Action;
 use Clivern\Imap\Core\Message\Attachments;
 use Clivern\Imap\Core\Message\Body;
 use Clivern\Imap\Core\Exception\FolderNotExistException;
@@ -118,7 +118,7 @@ class MailBox
     {
         $this->connection->survive($this->folder);
 
-        $message = new Message($this->connection, new Header($this->connection), new Actions($this->connection), new Attachments($this->connection), new Body($this->connection));
+        $message = new Message($this->connection, new Header($this->connection), new Action($this->connection), new Attachments($this->connection), new Body($this->connection));
 
         if( $message_number == false ){
             return $message->setUid($message_uid)->config();