diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3d66f2df0d8fc729cc7d70f9b0554d13c236d48..1933c9967869aa4db05e89f8d3e79fa87836e198 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,35 +117,35 @@ KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_HAVE_STD
   "Checking whether STL classes are in std namespace" DIRECT)
 
 IF(KWSYS_IOS_FORCE_OLD)
-  SET(KWSYS_IOS_HAVE_ANSI 0)
+  SET(KWSYS_IOS_USE_ANSI 0)
 ELSE(KWSYS_IOS_FORCE_OLD)
-  KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_ANSI
+  KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_ANSI
     "Checking whether ANSI stream headers are available" DIRECT)
 ENDIF(KWSYS_IOS_FORCE_OLD)
 
-IF(KWSYS_IOS_HAVE_ANSI)
+IF(KWSYS_IOS_USE_ANSI)
   KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STD
     "Checking whether ANSI streams are in std namespace" DIRECT)
-  KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_SSTREAM
+  KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_SSTREAM
     "Checking whether ANSI string stream is available" DIRECT)
-ELSE(KWSYS_IOS_HAVE_ANSI)
+ELSE(KWSYS_IOS_USE_ANSI)
   SET(KWSYS_IOS_HAVE_STD 0)
-  SET(KWSYS_IOS_HAVE_SSTREAM 0)
-ENDIF(KWSYS_IOS_HAVE_ANSI)
-
-IF(KWSYS_IOS_HAVE_SSTREAM)
-  SET(KWSYS_IOS_HAVE_STRSTREAM_H 0)
-  SET(KWSYS_IOS_HAVE_STRSTREA_H 0)
-ELSE(KWSYS_IOS_HAVE_SSTREAM)
-  KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STRSTREAM_H
+  SET(KWSYS_IOS_USE_SSTREAM 0)
+ENDIF(KWSYS_IOS_USE_ANSI)
+
+IF(KWSYS_IOS_USE_SSTREAM)
+  SET(KWSYS_IOS_USE_STRSTREAM_H 0)
+  SET(KWSYS_IOS_USE_STRSTREA_H 0)
+ELSE(KWSYS_IOS_USE_SSTREAM)
+  KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_STRSTREAM_H
     "Checking whether strstream.h is available" DIRECT)
-  IF(KWSYS_IOS_HAVE_STRSTREAM_H)
-    SET(KWSYS_IOS_HAVE_STRSTREA_H 0)
-  ELSE(KWSYS_IOS_HAVE_STRSTREAM_H)
-    KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STRSTREA_H
+  IF(KWSYS_IOS_USE_STRSTREAM_H)
+    SET(KWSYS_IOS_USE_STRSTREA_H 0)
+  ELSE(KWSYS_IOS_USE_STRSTREAM_H)
+    KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_STRSTREA_H
       "Checking whether strstrea.h is available" DIRECT)
-  ENDIF(KWSYS_IOS_HAVE_STRSTREAM_H)
-ENDIF(KWSYS_IOS_HAVE_SSTREAM)
+  ENDIF(KWSYS_IOS_USE_STRSTREAM_H)
+ENDIF(KWSYS_IOS_USE_SSTREAM)
 
 IF(KWSYS_NAMESPACE MATCHES "^kwsys$")
   SET(KWSYS_NAME_IS_KWSYS 1)
diff --git a/Configure.hxx.in b/Configure.hxx.in
index 6fbcec2e7db8b6b17b01be2700935ff2db7291e7..de939671c1d83510e95c4a04fdb7f04d1e983285 100644
--- a/Configure.hxx.in
+++ b/Configure.hxx.in
@@ -18,19 +18,19 @@
 #define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
 
 /* Whether ANSI C++ stream headers are to be used.  */
-#define @KWSYS_NAMESPACE@_IOS_HAVE_ANSI @KWSYS_IOS_HAVE_ANSI@
+#define @KWSYS_NAMESPACE@_IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@
 
 /* Whether ANSI C++ streams are in std namespace.  */
 #define @KWSYS_NAMESPACE@_IOS_HAVE_STD @KWSYS_IOS_HAVE_STD@
 
 /* Whether ANSI C++ <sstream> header is to be used.  */
-#define @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM @KWSYS_IOS_HAVE_SSTREAM@
+#define @KWSYS_NAMESPACE@_IOS_USE_SSTREAM @KWSYS_IOS_USE_SSTREAM@
 
 /* Whether old C++ <strstream.h> header is to be used.  */
-#define @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H @KWSYS_IOS_HAVE_STRSTREAM_H@
+#define @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H @KWSYS_IOS_USE_STRSTREAM_H@
 
 /* Whether old C++ <strstrea.h> header is to be used.  */
-#define @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H @KWSYS_IOS_HAVE_STRSTREA_H@
+#define @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H @KWSYS_IOS_USE_STRSTREA_H@
 
 /* Whether STL is in std namespace.  */
 #define @KWSYS_NAMESPACE@_STL_HAVE_STD @KWSYS_STL_HAVE_STD@
@@ -48,7 +48,7 @@
 #else
 # define @KWSYS_NAMESPACE@_ios_namespace
 #endif
-#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+#if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
 # define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios_namespace
 #else
 # define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios
@@ -61,13 +61,13 @@
 #  define kwsys_stl @KWSYS_NAMESPACE@_stl
 #  define kwsys_ios @KWSYS_NAMESPACE@_ios
 # endif
-# define KWSYS_NAME_IS_KWSYS        @KWSYS_NAMESPACE@_NAME_IS_KWSYS
-# define KWSYS_IOS_HAVE_ANSI        @KWSYS_NAMESPACE@_IOS_HAVE_ANSI
-# define KWSYS_IOS_HAVE_STD         @KWSYS_NAMESPACE@_IOS_HAVE_STD
-# define KWSYS_IOS_HAVE_SSTREAM     @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
-# define KWSYS_IOS_HAVE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H
-# define KWSYS_IOS_HAVE_STRSTREA_H  @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H
-# define KWSYS_STL_HAVE_STD         @KWSYS_NAMESPACE@_STL_HAVE_STD
+# define KWSYS_NAME_IS_KWSYS       @KWSYS_NAMESPACE@_NAME_IS_KWSYS
+# define KWSYS_STL_HAVE_STD        @KWSYS_NAMESPACE@_STL_HAVE_STD
+# define KWSYS_IOS_HAVE_STD        @KWSYS_NAMESPACE@_IOS_HAVE_STD
+# define KWSYS_IOS_USE_ANSI        @KWSYS_NAMESPACE@_IOS_USE_ANSI
+# define KWSYS_IOS_USE_SSTREAM     @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
+# define KWSYS_IOS_USE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H
+# define KWSYS_IOS_USE_STRSTREA_H  @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H
 #endif
 
 #endif
diff --git a/kwsysPlatformCxxTests.cxx b/kwsysPlatformCxxTests.cxx
index b2c016b0993e64e8a5fdc54cc4bbebf9c36195ca..e43bde55e665ed6ece1dd8fd9311d9ce51ca4240 100644
--- a/kwsysPlatformCxxTests.cxx
+++ b/kwsysPlatformCxxTests.cxx
@@ -4,7 +4,7 @@ void f(std::list<int>*) {}
 int main() { return 0; }
 #endif
 
-#ifdef TEST_KWSYS_IOS_HAVE_ANSI
+#ifdef TEST_KWSYS_IOS_USE_ANSI
 #include <iosfwd>
 int main() { return 0; }
 #endif
@@ -15,17 +15,17 @@ void f(std::ostream*) {}
 int main() { return 0; }
 #endif
 
-#ifdef TEST_KWSYS_IOS_HAVE_SSTREAM
+#ifdef TEST_KWSYS_IOS_USE_SSTREAM
 #include <sstream>
 int main() { return 0; }
 #endif
 
-#ifdef TEST_KWSYS_IOS_HAVE_STRSTREAM_H
+#ifdef TEST_KWSYS_IOS_USE_STRSTREAM_H
 #include <strstream.h>
 int main() { return 0; }
 #endif
 
-#ifdef TEST_KWSYS_IOS_HAVE_STRSTREA_H
+#ifdef TEST_KWSYS_IOS_USE_STRSTREA_H
 #include <strstrea.h>
 int main() { return 0; }
 #endif
diff --git a/kwsys_ios_fstream.h.in b/kwsys_ios_fstream.h.in
index e2d658f019a1d20351be05f29d5e22183ebc5b1c..5c270098af0d93da3e845bff7bc38571709fecb2 100644
--- a/kwsys_ios_fstream.h.in
+++ b/kwsys_ios_fstream.h.in
@@ -21,13 +21,13 @@
 #pragma warning (disable: 4702)
 #endif
 
-#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI
+#if @KWSYS_NAMESPACE@_IOS_USE_ANSI
 # include <fstream>
 #else
 # include <fstream.h>
 #endif
 
-#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+#if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM
 namespace @KWSYS_NAMESPACE@_ios
 {
   using @KWSYS_NAMESPACE@_ios_namespace::ostream;
diff --git a/kwsys_ios_iosfwd.h.in b/kwsys_ios_iosfwd.h.in
index c830c12d925e03ee90dab1626df758a3cbfa9ce0..597b6d91bfe982085a6ba59de7cb6d1fede2a222 100644
--- a/kwsys_ios_iosfwd.h.in
+++ b/kwsys_ios_iosfwd.h.in
@@ -21,7 +21,7 @@
 #pragma warning (disable: 4702)
 #endif
 
-#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI
+#if @KWSYS_NAMESPACE@_IOS_USE_ANSI
 # include <iosfwd>
 # include <fstream>
 #else
@@ -33,7 +33,7 @@ class ofstream;
 class ostream;
 #endif
 
-#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+#if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM
 namespace @KWSYS_NAMESPACE@_ios
 {
   using @KWSYS_NAMESPACE@_ios_namespace::fstream;
diff --git a/kwsys_ios_iostream.h.in b/kwsys_ios_iostream.h.in
index 1e7f496f4f63152024c773ded98b3c586325ea97..13b3408fc60b251d1721db557374896fbe6ab8f2 100644
--- a/kwsys_ios_iostream.h.in
+++ b/kwsys_ios_iostream.h.in
@@ -21,13 +21,13 @@
 #pragma warning (disable: 4702)
 #endif
 
-#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI
+#if @KWSYS_NAMESPACE@_IOS_USE_ANSI
 # include <iostream>
 #else
 # include <iostream.h>
 #endif
 
-#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+#if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM
 namespace @KWSYS_NAMESPACE@_ios
 {
   using @KWSYS_NAMESPACE@_ios_namespace::ostream;
diff --git a/kwsys_ios_sstream.h.in b/kwsys_ios_sstream.h.in
index 5e99c141e0983b8e8d686dd17a42f13f467d6795..8378cb368147e791c4ed952bd751a1b46de05864 100644
--- a/kwsys_ios_sstream.h.in
+++ b/kwsys_ios_sstream.h.in
@@ -21,7 +21,7 @@
 # define kwsys_stl @KWSYS_NAMESPACE@_stl
 #endif
 
-#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM
+#if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
 # ifdef _MSC_VER
 #  pragma warning (push, 1)
 #  pragma warning (disable: 4702)
@@ -35,11 +35,11 @@
 #  pragma warning (push, 1)
 #  pragma warning (disable: 4702)
 # endif
-# if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI
+# if @KWSYS_NAMESPACE@_IOS_USE_ANSI
 #  include <strstream>
-# elif @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H
+# elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H
 #  include <strstream.h>
-# elif @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H
+# elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H
 #  include <strstrea.h>
 # endif
 # ifdef _MSC_VER