diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java
index 72d0cf003ca96..d6a4e06e10e8c 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java
@@ -29,21 +29,21 @@ public class SslServerConfig {
     public Optional<Path> key;
 
     /**
-     * An optional key store which holds the certificate information instead of specifying separate files.
-     * The key store can be either on classpath or an external file.
+     * An optional keystore that holds the certificate information instead of specifying separate files.
+     * The keystore can be either on classpath or an external file.
      */
     @ConfigItem
     public Optional<Path> keyStore;
 
     /**
-     * An optional parameter to specify the type of the key store file. If not given, the type is automatically detected
+     * An optional parameter to specify the type of the keystore file. If not given, the type is automatically detected
      * based on the file name.
      */
     @ConfigItem
     public Optional<String> keyStoreType;
 
     /**
-     * A parameter to specify the password of the key store file. If not given, the default ("password") is used.
+     * A parameter to specify the password of the keystore file. If not given, the default ("password") is used.
      */
     @ConfigItem
     public Optional<String> keyStorePassword;
diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
index 34cdfd4c8857e..486b768c12024 100644
--- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
+++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
@@ -258,7 +258,7 @@ public static class Jwt {
             public Optional<String> keyFile = Optional.empty();
 
             /**
-             * If provided, indicates that JWT is signed using a private key from a keystore
+             * If provided, indicates that JWT is signed using a private key from a keystore.
              */
             @ConfigItem
             public Optional<String> keyStoreFile = Optional.empty();
@@ -454,7 +454,7 @@ public enum Verification {
         public Optional<Verification> verification = Optional.empty();
 
         /**
-         * An optional keystore which holds the certificate information instead of specifying separate files.
+         * An optional keystore that holds the certificate information instead of specifying separate files.
          */
         @ConfigItem
         public Optional<Path> keyStoreFile = Optional.empty();
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
index 377a59dc44a70..774fac0217c94 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
@@ -58,27 +58,27 @@ public class CertificateConfig {
     public Optional<List<Path>> keyFiles;
 
     /**
-     * An optional key store that holds the certificate information instead of specifying separate files.
+     * An optional keystore that holds the certificate information instead of specifying separate files.
      */
     @ConfigItem
     public Optional<Path> keyStoreFile;
 
     /**
-     * An optional parameter to specify the type of the key store file.
+     * An optional parameter to specify the type of the keystore file.
      * If not given, the type is automatically detected based on the file name.
      */
     @ConfigItem
     public Optional<String> keyStoreFileType;
 
     /**
-     * An optional parameter to specify a provider of the key store file.
-     * If not given, the provider is automatically detected based on the key store file type.
+     * An optional parameter to specify a provider of the keystore file.
+     * If not given, the provider is automatically detected based on the keystore file type.
      */
     @ConfigItem
     public Optional<String> keyStoreProvider;
 
     /**
-     * A parameter to specify the password of the key store file.
+     * A parameter to specify the password of the keystore file.
      * If not given, and if it can not be retrieved from {@linkplain CredentialsProvider}.
      *
      * @see {@link #credentialsProvider}
@@ -97,8 +97,8 @@ public class CertificateConfig {
     public Optional<String> keyStorePasswordKey;
 
     /**
-     * An optional parameter to select a specific key in the key store.
-     * When SNI is disabled, and the key store contains multiple
+     * An optional parameter to select a specific key in the keystore.
+     * When SNI is disabled, and the keystore contains multiple
      * keys and no alias is specified; the behavior is undefined.
      */
     @ConfigItem