diff --git a/server/src/main/java/org/elasticsearch/action/support/ListenableActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/ListenableActionFuture.java
index 7da2324bb873b..bbac7cba72b43 100644
--- a/server/src/main/java/org/elasticsearch/action/support/ListenableActionFuture.java
+++ b/server/src/main/java/org/elasticsearch/action/support/ListenableActionFuture.java
@@ -14,7 +14,7 @@
 import java.util.List;
 
 /**
- * A {@code Future} and {@link ActionListener} against which which other {@link ActionListener}s can be registered later, to support
+ * A {@code Future} and {@link ActionListener} against which other {@link ActionListener}s can be registered later, to support
  * fanning-out a result to a dynamic collection of listeners.
  */
 public class ListenableActionFuture<T> extends AdapterActionFuture<T, T> {
diff --git a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java
index c1307e8706833..6a2f49f99a2d7 100644
--- a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java
+++ b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java
@@ -1307,7 +1307,7 @@ public ClusterState execute(ClusterState currentState) {
                 // that will be opened by the restore
                 if (currentIndexMetadata == null) {
                     // Index doesn't exist - create it and start recovery
-                    // Make sure that the index we are about to create has a validate name
+                    // Make sure that the index we are about to create has a valid name
                     ensureValidIndexName(currentState, snapshotIndexMetadata, renamedIndexName);
                     shardLimitValidator.validateShardLimit(snapshotIndexMetadata.getSettings(), currentState);
 
diff --git a/server/src/main/java/org/elasticsearch/snapshots/package-info.java b/server/src/main/java/org/elasticsearch/snapshots/package-info.java
index 2df9a96656d01..3972a9ac02d5f 100644
--- a/server/src/main/java/org/elasticsearch/snapshots/package-info.java
+++ b/server/src/main/java/org/elasticsearch/snapshots/package-info.java
@@ -43,9 +43,9 @@
  * {@code UpdateIndexShardSnapshotStatusRequest}.</li>
  *
  * <li>If as a result of the received status update requests, all shards in the cluster state are in a completed state, i.e are marked as
- * either {@code SUCCESS}, {@code FAILED} or {@code MISSING}, the {@code SnapshotShardsService} will update the state of the {@code Entry}
+ * either {@code SUCCESS}, {@code FAILED} or {@code MISSING}, the {@code SnapshotsService} will update the state of the {@code Entry}
  * itself and mark it as {@code SUCCESS}. At the same time {@link org.elasticsearch.snapshots.SnapshotsService#endSnapshot} is executed,
- * writing the metadata necessary to finalize the snapshot in the repository to the repository.</li>
+ * writing to the repository the metadata necessary to finalize the snapshot in the repository.</li>
  *
  * <li>After writing the final metadata to the repository, a cluster state update to remove the snapshot from the cluster state is
  * submitted and the removal of the snapshot's {@code SnapshotsInProgress.Entry} from the cluster state completes the snapshot process.