diff --git a/core/src/main/java/org/openstack4j/api/compute/ComputeService.java b/core/src/main/java/org/openstack4j/api/compute/ComputeService.java
index b35a0c6b1..733e5f070 100644
--- a/core/src/main/java/org/openstack4j/api/compute/ComputeService.java
+++ b/core/src/main/java/org/openstack4j/api/compute/ComputeService.java
@@ -18,9 +18,9 @@
 public interface ComputeService extends RestService {
 	
 	 /**
-     * Server Event Service API
+     * Server Actions Service API
      *
-     * @return server event service
+     * @return server actions service
      */
     ServerActionsService events();
 
diff --git a/core/src/main/java/org/openstack4j/api/compute/ServerActionsService.java b/core/src/main/java/org/openstack4j/api/compute/ServerActionsService.java
index 02446b860..4dd9ff0a2 100644
--- a/core/src/main/java/org/openstack4j/api/compute/ServerActionsService.java
+++ b/core/src/main/java/org/openstack4j/api/compute/ServerActionsService.java
@@ -6,7 +6,7 @@
 import org.openstack4j.model.compute.ServerAction;
 
 /**
- * This interface defines all methods for the manipulation of events
+ * This interface defines all methods for the manipulation of server actions
  *
  * @author sujit sah
  *
@@ -21,11 +21,11 @@ public interface ServerActionsService extends RestService {
     List<? extends ServerAction> list(String serverId);
 
     /**
-     * Gets a event of currently existing {@link ServerAction}s for a specified request id
+     * Gets the server action associated with specific request id for the specified server
      *
      * @param serverId  the id of server
-     * @param requestId the request id of server
-     * @return the server event detail
+     * @param request id of specific action for the specified server
+     * @return the server action detail
      */
     ServerAction show(String serverId, String requestId);
 
diff --git a/core/src/main/java/org/openstack4j/model/compute/ServerAction.java b/core/src/main/java/org/openstack4j/model/compute/ServerAction.java
index e6686031b..b93e7cf76 100644
--- a/core/src/main/java/org/openstack4j/model/compute/ServerAction.java
+++ b/core/src/main/java/org/openstack4j/model/compute/ServerAction.java
@@ -18,16 +18,16 @@
  */
 public interface ServerAction extends ModelEntity {
     /**
-     * Returns the action of the event
+     * Returns the action performed on the server
      *
-     * @return the action of the event
+     * @return the action performed on the server
      */
     public String getAction();
 
     /**
-     * Returns the list of event
+     * Returns the list of server actions
      *
-     * @return the list of event
+     * @return the list of server actions
      */
     public List<? extends ServerActionEvent> getEvents();
 
@@ -39,16 +39,16 @@ public interface ServerAction extends ModelEntity {
     public String getInstaceUuid();
 
     /**
-     * Returns the request id of the event
+     * Returns the request id of the server action
      *
-     * @return the request id of the event
+     * @return the request id of the server action
      */
     public String getRequestId();
 
     /**
-     * Returns the start_time of the event
+     * Returns the start_time of the server action
      *
-     * @return the start_time of the event
+     * @return the start_time of the server action
      */
     public Date getStartTime();
 
diff --git a/core/src/main/java/org/openstack4j/model/compute/builder/ServerActionEventBuilder.java b/core/src/main/java/org/openstack4j/model/compute/builder/ServerActionEventBuilder.java
index f9d880d0c..da2c12e59 100644
--- a/core/src/main/java/org/openstack4j/model/compute/builder/ServerActionEventBuilder.java
+++ b/core/src/main/java/org/openstack4j/model/compute/builder/ServerActionEventBuilder.java
@@ -4,7 +4,7 @@
 import org.openstack4j.model.compute.ServerActionEvent;
 
 /**
- * Builder which create events
+ * Builder which create server action events
  *
  * @author sujit sah
  *