diff --git a/java-spiffe-core/src/test/java/io/spiffe/internal/DummyX509Certificate.java b/java-spiffe-core/src/test/java/io/spiffe/internal/DummyX509Certificate.java
index 3664575..0dfbf22 100644
--- a/java-spiffe-core/src/test/java/io/spiffe/internal/DummyX509Certificate.java
+++ b/java-spiffe-core/src/test/java/io/spiffe/internal/DummyX509Certificate.java
@@ -15,7 +15,7 @@ import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Set;
 
-// Dummy implementation of a X509Certificate used for testing purposes
+// Dummy implementation of an X509Certificate used for testing purposes
 public class DummyX509Certificate extends X509Certificate {
     @Override
     public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException {
diff --git a/java-spiffe-core/src/test/java/io/spiffe/workloadapi/FakeWorkloadApi.java b/java-spiffe-core/src/test/java/io/spiffe/workloadapi/FakeWorkloadApi.java
index 5b512f8..1dccfda 100644
--- a/java-spiffe-core/src/test/java/io/spiffe/workloadapi/FakeWorkloadApi.java
+++ b/java-spiffe-core/src/test/java/io/spiffe/workloadapi/FakeWorkloadApi.java
@@ -37,7 +37,7 @@ class FakeWorkloadApi extends SpiffeWorkloadAPIImplBase {
     final String jwtBundle = "testdata/workloadapi/bundle.json";
 
 
-    // Loads cert, bundle and key from files and generates a X509SVIDResponse.
+    // Loads cert, bundle and key from files and generates an X509SVIDResponse.
     @Override
     public void fetchX509SVID(Workload.X509SVIDRequest request, StreamObserver<Workload.X509SVIDResponse> responseObserver) {
         try {
diff --git a/java-spiffe-helper/src/test/java/io/spiffe/helper/keystore/FakeWorkloadApi.java b/java-spiffe-helper/src/test/java/io/spiffe/helper/keystore/FakeWorkloadApi.java
index af9f67c..50d2b44 100644
--- a/java-spiffe-helper/src/test/java/io/spiffe/helper/keystore/FakeWorkloadApi.java
+++ b/java-spiffe-helper/src/test/java/io/spiffe/helper/keystore/FakeWorkloadApi.java
@@ -19,7 +19,7 @@ class FakeWorkloadApi extends SpiffeWorkloadAPIImplBase {
     final String x509Bundle = "testdata/bundle.der";
 
 
-    // Loads cert, bundle and key from files and generates a X509SVIDResponse.
+    // Loads cert, bundle and key from files and generates an X509SVIDResponse.
     @Override
     public void fetchX509SVID(Workload.X509SVIDRequest request, StreamObserver<Workload.X509SVIDResponse> responseObserver) {
         try {
diff --git a/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeKeyManagerFactory.java b/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeKeyManagerFactory.java
index bb1b2d1..e4237f6 100644
--- a/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeKeyManagerFactory.java
+++ b/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeKeyManagerFactory.java
@@ -16,7 +16,7 @@ import java.security.KeyStore;
  * Implementation of a {@link KeyManagerFactorySpi} to create a {@link KeyManager} that is backed by the Workload API.
  * <p>
  * The Java Security API will call <code>engineGetKeyManagers()</code> to get an instance of a KeyManager.
- * This KeyManager instance is injected with a {@link X509Source} to obtain the latest X.509 SVIDs updates
+ * This KeyManager instance is injected with an {@link X509Source} to obtain the latest X.509 SVIDs updates
  * from the Workload API.
  *
  * @see SpiffeSslContextFactory
@@ -27,7 +27,7 @@ import java.security.KeyStore;
 public final class SpiffeKeyManagerFactory extends KeyManagerFactorySpi {
 
     /**
-     * Default method for creating the KeyManager, uses a {@link X509Source} instance
+     * Default method for creating the KeyManager, uses an {@link X509Source} instance
      * that is handled by the Singleton {@link X509SourceManager}
      *
      * @throws SpiffeProviderException in case there is an error setting up the X.509 source
diff --git a/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeSslContextFactory.java b/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeSslContextFactory.java
index 838455e..818eb29 100644
--- a/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeSslContextFactory.java
+++ b/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeSslContextFactory.java
@@ -29,7 +29,7 @@ public final class SpiffeSslContextFactory {
 
     /**
      * Creates an {@link SSLContext} initialized with a {@link SpiffeKeyManager} and {@link SpiffeTrustManager}
-     * that are backed by the Workload API via a {@link X509Source}.
+     * that are backed by the Workload API via an {@link X509Source}.
      *
      * @param options {@link SslContextOptions}. The option {@link X509Source} must be not null.
      *                If the option <code>acceptedSpiffeIdsSupplier</code> is not provided, the Set of accepted SPIFFE IDs
@@ -78,7 +78,7 @@ public final class SpiffeSslContextFactory {
      * <p>
      * <code>sslProtocol</code> The SSL Protocol. Default: TLSv1.2
      * <p>
-     * <code>x509Source</code> A {@link X509Source} that provides the X.509 materials.
+     * <code>x509Source</code> An {@link X509Source} that provides the X.509 materials.
      * <p>
      * <code>acceptedSpiffeIdsSupplier</code> A supplier of a set of {@link SpiffeId} that will be accepted
      * for a secure socket connection.
diff --git a/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeTrustManagerFactory.java b/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeTrustManagerFactory.java
index 455f5c7..e5ebf48 100644
--- a/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeTrustManagerFactory.java
+++ b/java-spiffe-provider/src/main/java/io/spiffe/provider/SpiffeTrustManagerFactory.java
@@ -25,7 +25,7 @@ import static io.spiffe.provider.SpiffeProviderConstants.SSL_SPIFFE_ACCEPT_PROPE
  * {@link X509Source} that is maintained via the Workload API.
  * <p>
  * The Java Security API will call <code>engineGetTrustManagers()</code> to get an instance of a {@link TrustManager}.
- * This TrustManager instance gets injected a {@link X509Source}, which implements {@link BundleSource} and
+ * This TrustManager instance gets injected an {@link X509Source}, which implements {@link BundleSource} and
  * keeps bundles updated.
  * The TrustManager also gets a Supplier of a Set of accepted SPIFFE IDs used to validate the SPIFFE ID from the SVIDs
  * presented by a peer during the secure socket handshake.
diff --git a/java-spiffe-provider/src/main/java/io/spiffe/provider/X509SourceManager.java b/java-spiffe-provider/src/main/java/io/spiffe/provider/X509SourceManager.java
index 3515418..77b8a52 100644
--- a/java-spiffe-provider/src/main/java/io/spiffe/provider/X509SourceManager.java
+++ b/java-spiffe-provider/src/main/java/io/spiffe/provider/X509SourceManager.java
@@ -5,7 +5,7 @@ import io.spiffe.exception.X509SourceException;
 import io.spiffe.workloadapi.X509Source;
 
 /**
- * Singleton that handles an instance of a {@link X509Source}.
+ * Singleton that handles an instance of an {@link X509Source}.
  * <p>
  * The default SPIFFE socket endpoint address is used to create an X.509 Source backed by the
  * Workload API.