diff --git a/Parse/src/main/java/com/parse/CachedCurrentUserController.java b/Parse/src/main/java/com/parse/CachedCurrentUserController.java
index 331e359fd..04d81efa2 100644
--- a/Parse/src/main/java/com/parse/CachedCurrentUserController.java
+++ b/Parse/src/main/java/com/parse/CachedCurrentUserController.java
@@ -160,7 +160,7 @@ public String then(Task<ParseUser> task) throws Exception {
   }
 
   @Override
-  public Task<Void> logoutAsync() {
+  public Task<Void> logOutAsync() {
     return taskQueue.enqueue(new Continuation<Void, Task<Void>>() {
       @Override
       public Task<Void> then(Task<Void> toAwait) throws Exception {
diff --git a/Parse/src/main/java/com/parse/ParseCurrentUserController.java b/Parse/src/main/java/com/parse/ParseCurrentUserController.java
index d4340677e..0805ae2b4 100644
--- a/Parse/src/main/java/com/parse/ParseCurrentUserController.java
+++ b/Parse/src/main/java/com/parse/ParseCurrentUserController.java
@@ -14,7 +14,7 @@
     extends ParseObjectCurrentController<ParseUser> {
 
   /**
-   * Get the persisted current ParseUser
+   * Gets the persisted current ParseUser.
    * @param shouldAutoCreateUser
    * @return
    */
@@ -28,14 +28,14 @@
   Task<Void> setIfNeededAsync(ParseUser user);
 
   /**
-   * Get the session token of the persisted current ParseUser
+   * Gets the session token of the persisted current ParseUser.
    * @return
    */
   Task<String> getCurrentSessionTokenAsync();
 
   /**
-   * Logout the current ParseUser
+   * Logs out the current ParseUser.
    * @return
    */
-  Task<Void> logoutAsync();
+  Task<Void> logOutAsync();
 }
diff --git a/Parse/src/main/java/com/parse/ParseUser.java b/Parse/src/main/java/com/parse/ParseUser.java
index d80c3373e..90f71e6af 100644
--- a/Parse/src/main/java/com/parse/ParseUser.java
+++ b/Parse/src/main/java/com/parse/ParseUser.java
@@ -937,7 +937,7 @@ private static Task<Void> saveCurrentUserAsync(ParseUser user) {
    * @return A Task that is resolved when logging out completes.
    */
   public static Task<Void> logOutInBackground() {
-    return getCurrentUserController().logoutAsync();
+    return getCurrentUserController().logOutAsync();
   }
 
   /**
diff --git a/Parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java b/Parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java
index b83211cc0..c743828f3 100644
--- a/Parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java
+++ b/Parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java
@@ -295,7 +295,7 @@ public void testLogOutAsyncWithDeleteInDiskCurrentUserSuccess() throws Exception
     when(currentUser.logOutAsync()).thenReturn(Task.<Void>forResult(null));
     controller.currentUser = currentUser;
 
-    ParseTaskUtils.wait(controller.logoutAsync());
+    ParseTaskUtils.wait(controller.logOutAsync());
 
     // Make sure currentUser.logout() is called
     verify(currentUser, times(1)).logOutAsync();
@@ -316,7 +316,7 @@ public void testLogOutAsyncWithDeleteInDiskCurrentUserFailure() throws Exception
     CachedCurrentUserController controller =
         new CachedCurrentUserController(store);
 
-    ParseTaskUtils.wait(controller.logoutAsync());
+    ParseTaskUtils.wait(controller.logOutAsync());
 
     // Make sure controller state is correct
     assertNull(controller.currentUser);