--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java	Fri Mar 09 17:36:02 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java	Fri Mar 09 17:59:11 2018 +0000
@@ -93,7 +93,7 @@
             hostnameVerificationDisabledValue();
 
     private static boolean hostnameVerificationDisabledValue() {
-        String prop = getProperty("jdk.internal.http.disableHostnameVerification");
+        String prop = getProperty("jdk.internal.httpclient.disableHostnameVerification");
         if (prop == null)
             return false;
         return prop.isEmpty() ?  true : Boolean.parseBoolean(prop);
@@ -397,7 +397,7 @@
 
     public static int getIntegerProperty(String name, int defaultValue) {
         return AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
-                Integer.parseInt(System.getProperty(name, String.valueOf(defaultValue)));
+                Integer.parseInt(System.getProperty(name, String.valueOf(defaultValue))));
     }
 
     public static SSLParameters copySSLParameters(SSLParameters p) {

--- a/test/jdk/java/net/httpclient/ssltest/CertificateTest.java	Fri Mar 09 17:36:02 2018 +0000
+++ b/test/jdk/java/net/httpclient/ssltest/CertificateTest.java	Fri Mar 09 17:59:11 2018 +0000
@@ -37,16 +37,16 @@
  * @run main/othervm CertificateTest good.keystore expectSuccess
  * @run main/othervm CertificateTest bad.keystore expectFailure
  * @run main/othervm
- *      -Djdk.internal.http.disableHostnameVerification
+ *      -Djdk.internal.httpclient.disableHostnameVerification
  *       CertificateTest bad.keystore expectSuccess
  * @run main/othervm
- *      -Djdk.internal.http.disableHostnameVerification=true
+ *      -Djdk.internal.httpclient.disableHostnameVerification=true
  *       CertificateTest bad.keystore expectSuccess
  * @run main/othervm
- *      -Djdk.internal.http.disableHostnameVerification=false
+ *      -Djdk.internal.httpclient.disableHostnameVerification=false
  *       CertificateTest bad.keystore expectFailure
  * @run main/othervm
- *      -Djdk.internal.http.disableHostnameVerification=xxyyzz
+ *      -Djdk.internal.httpclient.disableHostnameVerification=xxyyzz
  *       CertificateTest bad.keystore expectFailure
  */