diff --git a/spec/std/openssl/ssl/context_spec.cr b/spec/std/openssl/ssl/context_spec.cr
index 7a6f0d6882bb..09e58fd849b3 100644
--- a/spec/std/openssl/ssl/context_spec.cr
+++ b/spec/std/openssl/ssl/context_spec.cr
@@ -6,8 +6,8 @@ describe OpenSSL::SSL::Context do
     context = OpenSSL::SSL::Context::Client.new
 
     (context.options & OpenSSL::SSL::Options::ALL).should eq(OpenSSL::SSL::Options::ALL)
-    (context.options & OpenSSL::SSL::Options::NO_SSLV2).should eq(OpenSSL::SSL::Options::NO_SSLV2)
-    (context.options & OpenSSL::SSL::Options::NO_SSLV3).should eq(OpenSSL::SSL::Options::NO_SSLV3)
+    (context.options & OpenSSL::SSL::Options::NO_SSL_V2).should eq(OpenSSL::SSL::Options::NO_SSL_V2)
+    (context.options & OpenSSL::SSL::Options::NO_SSL_V3).should eq(OpenSSL::SSL::Options::NO_SSL_V3)
     (context.options & OpenSSL::SSL::Options::NO_SESSION_RESUMPTION_ON_RENEGOTIATION).should eq(OpenSSL::SSL::Options::NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
     (context.options & OpenSSL::SSL::Options::SINGLE_ECDH_USE).should eq(OpenSSL::SSL::Options::SINGLE_ECDH_USE)
     (context.options & OpenSSL::SSL::Options::SINGLE_DH_USE).should eq(OpenSSL::SSL::Options::SINGLE_DH_USE)
@@ -22,8 +22,8 @@ describe OpenSSL::SSL::Context do
     context = OpenSSL::SSL::Context::Server.new
 
     (context.options & OpenSSL::SSL::Options::ALL).should eq(OpenSSL::SSL::Options::ALL)
-    (context.options & OpenSSL::SSL::Options::NO_SSLV2).should eq(OpenSSL::SSL::Options::NO_SSLV2)
-    (context.options & OpenSSL::SSL::Options::NO_SSLV3).should eq(OpenSSL::SSL::Options::NO_SSLV3)
+    (context.options & OpenSSL::SSL::Options::NO_SSL_V2).should eq(OpenSSL::SSL::Options::NO_SSL_V2)
+    (context.options & OpenSSL::SSL::Options::NO_SSL_V3).should eq(OpenSSL::SSL::Options::NO_SSL_V3)
     (context.options & OpenSSL::SSL::Options::NO_SESSION_RESUMPTION_ON_RENEGOTIATION).should eq(OpenSSL::SSL::Options::NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
     (context.options & OpenSSL::SSL::Options::SINGLE_ECDH_USE).should eq(OpenSSL::SSL::Options::SINGLE_ECDH_USE)
     (context.options & OpenSSL::SSL::Options::SINGLE_DH_USE).should eq(OpenSSL::SSL::Options::SINGLE_DH_USE)
@@ -96,22 +96,22 @@ describe OpenSSL::SSL::Context do
     context.add_options(OpenSSL::SSL::Options::ALL)
            .should eq(default_options | OpenSSL::SSL::Options::ALL)
 
-    context.add_options(OpenSSL::SSL::Options.flags(NO_SSLV2, NO_SSLV3))
-           .should eq(OpenSSL::SSL::Options.flags(ALL, NO_SSLV2, NO_SSLV3))
+    context.add_options(OpenSSL::SSL::Options.flags(NO_SSL_V2, NO_SSL_V3))
+           .should eq(OpenSSL::SSL::Options.flags(ALL, NO_SSL_V2, NO_SSL_V3))
   end
 
   it "removes options" do
     context = OpenSSL::SSL::Context::Client.insecure
     default_options = context.options
-    context.add_options(OpenSSL::SSL::Options.flags(NO_TLSV1, NO_SSLV2))
-    context.remove_options(OpenSSL::SSL::Options::NO_TLSV1).should eq(default_options | OpenSSL::SSL::Options::NO_SSLV2)
+    context.add_options(OpenSSL::SSL::Options.flags(NO_TLS_V1, NO_SSL_V2))
+    context.remove_options(OpenSSL::SSL::Options::NO_TLS_V1).should eq(default_options | OpenSSL::SSL::Options::NO_SSL_V2)
   end
 
   it "returns options" do
     context = OpenSSL::SSL::Context::Client.insecure
     default_options = context.options
-    context.add_options(OpenSSL::SSL::Options.flags(ALL, NO_SSLV2))
-    context.options.should eq(default_options | OpenSSL::SSL::Options.flags(ALL, NO_SSLV2))
+    context.add_options(OpenSSL::SSL::Options.flags(ALL, NO_SSL_V2))
+    context.options.should eq(default_options | OpenSSL::SSL::Options.flags(ALL, NO_SSL_V2))
   end
 
   it "adds modes" do
diff --git a/src/openssl/lib_ssl.cr b/src/openssl/lib_ssl.cr
index 0593b5728374..e69f82bddae1 100644
--- a/src/openssl/lib_ssl.cr
+++ b/src/openssl/lib_ssl.cr
@@ -83,10 +83,10 @@ lib LibSSL
     CIPHER_SERVER_PREFERENCE               = 0x00400000
     TLS_ROLLBACK_BUG                       = 0x00800000
 
-    NO_SSLV3   = 0x02000000
-    NO_TLSV1   = 0x04000000
-    NO_TLSV1_2 = 0x08000000
-    NO_TLSV1_1 = 0x10000000
+    NO_SSL_V3   = 0x02000000
+    NO_TLS_V1   = 0x04000000
+    NO_TLS_V1_2 = 0x08000000
+    NO_TLS_V1_1 = 0x10000000
 
     NETSCAPE_CA_DN_BUG              = 0x20000000
     NETSCAPE_DEMO_CIPHER_CHANGE_BUG = 0x40000000
@@ -97,11 +97,11 @@ lib LibSSL
       NETSCAPE_CHALLENGE_BUG           = 0x00000000
       NETSCAPE_REUSE_CIPHER_CHANGE_BUG = 0x00000000
       SSLREF2_REUSE_CERT_TYPE_BUG      = 0x00000000
-      MICROSOFT_BIG_SSLV3_BUFFER       = 0x00000000
+      MICROSOFT_BIG_SSL_V3_BUFFER       = 0x00000000
       SSLEAY_080_CLIENT_DH_BUG         = 0x00000000
       TLS_D5_BUG                       = 0x00000000
       TLS_BLOCK_PADDING_BUG            = 0x00000000
-      NO_SSLV2                         = 0x00000000
+      NO_SSL_V2                         = 0x00000000
       SINGLE_ECDH_USE                  = 0x00000000
       SINGLE_DH_USE                    = 0x00000000
     {% else %}
@@ -109,11 +109,11 @@ lib LibSSL
       NETSCAPE_CHALLENGE_BUG           = 0x00000002
       NETSCAPE_REUSE_CIPHER_CHANGE_BUG = 0x00000008
       SSLREF2_REUSE_CERT_TYPE_BUG      = 0x00000010
-      MICROSOFT_BIG_SSLV3_BUFFER       = 0x00000020
+      MICROSOFT_BIG_SSL_V3_BUFFER       = 0x00000020
       SSLEAY_080_CLIENT_DH_BUG         = 0x00000080
       TLS_D5_BUG                       = 0x00000100
       TLS_BLOCK_PADDING_BUG            = 0x00000200
-      NO_SSLV2                         = 0x01000000
+      NO_SSL_V2                         = 0x01000000
       SINGLE_ECDH_USE                  = 0x00080000
       SINGLE_DH_USE                    = 0x00100000
     {% end %}
diff --git a/src/openssl/ssl/context.cr b/src/openssl/ssl/context.cr
index e71f2544f66d..fb735db7e8de 100644
--- a/src/openssl/ssl/context.cr
+++ b/src/openssl/ssl/context.cr
@@ -70,7 +70,7 @@ abstract class OpenSSL::SSL::Context
     # require "openssl"
     #
     # context = OpenSSL::SSL::Context::Client.new
-    # context.add_options(OpenSSL::SSL::Options::NO_SSLV2 | OpenSSL::SSL::Options::NO_SSLV3)
+    # context.add_options(OpenSSL::SSL::Options::NO_SSL_V2 | OpenSSL::SSL::Options::NO_SSL_V3)
     # ```
     def initialize(method : LibSSL::SSLMethod = Context.default_method)
       super(method)
@@ -123,7 +123,7 @@ abstract class OpenSSL::SSL::Context
     #
     # ```
     # context = OpenSSL::SSL::Context::Server.new
-    # context.add_options(OpenSSL::SSL::Options::NO_SSLV2 | OpenSSL::SSL::Options::NO_SSLV3)
+    # context.add_options(OpenSSL::SSL::Options::NO_SSL_V2 | OpenSSL::SSL::Options::NO_SSL_V3)
     # ```
     def initialize(method : LibSSL::SSLMethod = Context.default_method)
       super(method)
@@ -151,8 +151,8 @@ abstract class OpenSSL::SSL::Context
 
     add_options(OpenSSL::SSL::Options.flags(
       ALL,
-      NO_SSLV2,
-      NO_SSLV3,
+      NO_SSL_V2,
+      NO_SSL_V3,
       NO_SESSION_RESUMPTION_ON_RENEGOTIATION,
       SINGLE_ECDH_USE,
       SINGLE_DH_USE
@@ -265,9 +265,9 @@ abstract class OpenSSL::SSL::Context
   # Example:
   # ```
   # context.add_options(
-  #   OpenSSL::SSL::Options::ALL |      # various workarounds
-  #   OpenSSL::SSL::Options::NO_SSLV2 | # disable overly deprecated SSLv2
-  #   OpenSSL::SSL::Options::NO_SSLV3   # disable deprecated SSLv3
+  #   OpenSSL::SSL::Options::ALL |       # various workarounds
+  #   OpenSSL::SSL::Options::NO_SSL_V2 | # disable overly deprecated SSLv2
+  #   OpenSSL::SSL::Options::NO_SSL_V3   # disable deprecated SSLv3
   # )
   # ```
   def add_options(options : OpenSSL::SSL::Options)
@@ -283,7 +283,7 @@ abstract class OpenSSL::SSL::Context
   #
   # Example:
   # ```
-  # context.remove_options(OpenSSL::SSL::Options::NO_SSLV3)
+  # context.remove_options(OpenSSL::SSL::Options::NO_SSL_V3)
   # ```
   def remove_options(options : OpenSSL::SSL::Options)
     opts = {% if LibSSL::OPENSSL_110 %}