diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index ce2ea0b1..22957c38 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -288,7 +288,7 @@ enum ssh_options_e {
   SSH_OPTIONS_CIPHERS_S_C,
   SSH_OPTIONS_COMPRESSION_C_S,
   SSH_OPTIONS_COMPRESSION_S_C,
-  SSH_OPTIONS_HOSTKEYCHECK,
+  SSH_OPTIONS_STRICTHOSTKEYCHECK,
   SSH_OPTIONS_PROXYCOMMAND,
   SSH_OPTIONS_BINDADDR
 };
diff --git a/src/config.c b/src/config.c
index cfe2cc5f..03e6e904 100644
--- a/src/config.c
+++ b/src/config.c
@@ -40,7 +40,7 @@ enum ssh_config_opcode_e {
   SOC_COMPRESSION,
   SOC_TIMEOUT,
   SOC_PROTOCOL,
-  SOC_HOSTKEYCHECK,
+  SOC_STRICTHOSTKEYCHECK,
   SOC_KNOWNHOSTS,
   SOC_PROXYCOMMAND
 };
@@ -60,7 +60,7 @@ static struct ssh_config_keyword_table_s ssh_config_keyword_table[] = {
   { "compression", SOC_COMPRESSION },
   { "connecttimeout", SOC_TIMEOUT },
   { "protocol", SOC_PROTOCOL },
-  { "stricthostkeychecking", SOC_HOSTKEYCHECK },
+  { "stricthostkeychecking", SOC_STRICTHOSTKEYCHECK },
   { "userknownhostsfile", SOC_KNOWNHOSTS },
   { "proxycommand", SOC_PROXYCOMMAND },
   { NULL, SOC_UNSUPPORTED }
@@ -284,10 +284,10 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
         ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &i);
       }
       break;
-    case SOC_HOSTKEYCHECK:
+    case SOC_STRICTHOSTKEYCHECK:
       i = ssh_config_get_yesno(&s, -1);
       if (i >= 0 && *parsing) {
-        ssh_options_set(session, SSH_OPTIONS_HOSTKEYCHECK, &i);
+        ssh_options_set(session, SSH_OPTIONS_STRICTHOSTKEYCHECK, &i);
       }
       break;
     case SOC_KNOWNHOSTS:
diff --git a/src/options.c b/src/options.c
index eae9280f..85375c54 100644
--- a/src/options.c
+++ b/src/options.c
@@ -318,7 +318,7 @@ int ssh_options_set_algo(ssh_session session, int algo,
  *                        Set the compression to use for server to client
  *                        communication (string, "none" or "zlib").
  *
- *                      - SSH_OPTIONS_HOSTKEYCHECK:
+ *                      - SSH_OPTIONS_STRICTHOSTKEYCHECK:
  *                        Set the parameter StrictHostKeyChecking to avoid
  *                        asking about a fingerprint (integer, 0 = false).
  *
@@ -588,7 +588,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
           return -1;
       }
       break;
-    case SSH_OPTIONS_HOSTKEYCHECK:
+    case SSH_OPTIONS_STRICTHOSTKEYCHECK:
       if (value == NULL) {
         ssh_set_error_invalid(session, __FUNCTION__);
         return -1;