WinRT -> UWP renames

19 files changed, 92 insertions, 92 deletions

diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index 558c939d5ef..18cbd0d7e64 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -32,14 +32,14 @@ allTests(const CommunicatorPtr& communicator)
     test(obj == base);
 #endif
     cout << "ok" << endl;
-#ifdef ICE_OS_WINRT
-    bool winrt = true;
+#ifdef ICE_OS_UWP
+    bool uwp = true;
 #else
-    bool winrt = false;
+    bool uwp = false;
 #endif
 
     {
-        if(!winrt || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
+        if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
                       communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
         {
             cout << "creating/destroying/recreating object adapter... " << flush;
diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp
index bbe87980315..9f68051843c 100644
--- a/cpp/test/Ice/admin/AllTests.cpp
+++ b/cpp/test/Ice/admin/AllTests.cpp
@@ -368,9 +368,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     cout << "ok" << endl;
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     //
-    // This doesn't work well with WinRT because connection to localhost are
+    // This doesn't work well with UWP because connection to localhost are
     // restricted to the same process.
     //
     cout << "testing logger facet... " << flush;
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index cc6bc02cdd6..1ba9dec589b 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -950,7 +950,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         serverProps.push_back(localipv4);
         serverProps.push_back(localipv6);
 
-#if defined(_WIN32) && !defined(ICE_OS_WINRT)
+#if defined(_WIN32) && !defined(ICE_OS_UWP)
         OSVERSIONINFO ver;
         ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 #  if defined(_MSC_VER) && _MSC_VER >= 1800
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index caa960b8938..cb3d05277c0 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -501,13 +501,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         localOAEndpoint = ostr.str();
     }
-#ifdef ICE_OS_WINRT
-    bool winrt = true;
+#ifdef ICE_OS_UWP
+    bool uwp = true;
 #else
-    bool winrt = false;
+    bool uwp = false;
 #endif
 
-    if(!winrt || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
+    if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
                   communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
     {
         cout << "testing object adapter registration exceptions... " << flush;
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index fc9a76105ba..fd3299dcd38 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -22,10 +22,10 @@ class EmptyI : public virtual Empty
 GPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
-#ifdef ICE_OS_WINRT
-    bool winrt = true;
+#ifdef ICE_OS_UWP
+    bool uwp = true;
 #else
-    bool winrt = false;
+    bool uwp = false;
 #endif
 
     cout << "testing Ice.Admin.Facets property... " << flush;
@@ -64,7 +64,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         localOAEndpoint = ostr.str();
     }
     communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", localOAEndpoint);
-    if(winrt || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
+    if(uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
                  communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
     {
         Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter");
diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp
index fad164cee81..b1b0a373914 100644
--- a/cpp/test/Ice/hash/Client.cpp
+++ b/cpp/test/Ice/hash/Client.cpp
@@ -36,9 +36,9 @@ int main(int argc, char** argv)
 
     Ice::InitializationData id;
     id.properties = Ice::createProperties(argc, argv);
-#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0
+#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0
     //
-    // In Ice for WinRT IceSSL is part of Ice core.
+    // In Ice for UWP IceSSL is part of Ice core.
     //
     id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
     id.properties->setProperty("IceSSL.Keychain", "client.keychain");
diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp
index 542d3194e59..124b5069aad 100644
--- a/cpp/test/Ice/info/AllTests.cpp
+++ b/cpp/test/Ice/info/AllTests.cpp
@@ -66,7 +66,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(ipEndpoint->host == "tcphost");
         test(ipEndpoint->port == 10000);
         test(ipEndpoint->timeout == 1200);
-#if !defined(ICE_OS_WINRT)
+#if !defined(ICE_OS_UWP)
         test(ipEndpoint->sourceAddress == "10.10.10.10");
 #endif
         test(ipEndpoint->compress);
@@ -85,7 +85,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(udpEndpoint);
         test(udpEndpoint->host == "udphost");
         test(udpEndpoint->port == 10001);
-#if !defined(ICE_OS_WINRT)
+#if !defined(ICE_OS_UWP)
         test(udpEndpoint->sourceAddress == "10.10.10.10");
 #endif
         test(udpEndpoint->mcastInterface == "eth0");
@@ -106,12 +106,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     string defaultHost = communicator->getProperties()->getProperty("Ice.Default.Host");
-#ifdef ICE_OS_WINRT
-    bool winrt = true;
+#ifdef ICE_OS_UWP
+    bool uwp = true;
 #else
-    bool winrt = false;
+    bool uwp = false;
 #endif
-    if(!winrt || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
+    if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
                   communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
     {
         cout << "test object adapter endpoint information... " << flush;
@@ -215,7 +215,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             test(info->remoteAddress == defaultHost);
             test(info->localAddress == defaultHost);
         }
-#if !defined(ICE_OS_WINRT)
+#if !defined(ICE_OS_UWP)
         test(info->rcvSize >= 1024);
         test(info->sndSize >= 2048);
 #endif
@@ -246,7 +246,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             {
                 IceSSL::ConnectionInfoPtr wssinfo = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, wsinfo->underlying);
                 test(wssinfo->verified);
-#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0
+#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0
                 test(!wssinfo->certs.empty());
 #endif
             }
@@ -277,7 +277,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             test(udpinfo->localAddress == defaultHost);
         }
 
-#if !defined(ICE_OS_WINRT)
+#if !defined(ICE_OS_UWP)
         test(udpinfo->rcvSize >= 2048);
         test(udpinfo->sndSize >= 1024);
 #endif
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 39ea56f9462..3a479e23436 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -689,15 +689,15 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_OS_WINRT
-    bool winrt = true;
+#ifdef ICE_OS_UWP
+    bool uwp = true;
 #else
-    bool winrt = false;
+    bool uwp = false;
 #endif
     string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ?
             "127.0.0.1" : "\"0:0:0:0:0:0:0:1\"";
         
-    if(!winrt || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
+    if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
                   communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
     {
         if(communicator->getProperties()->getProperty("Ice.Default.Host") == host)
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index 3faea063c8d..59d31219482 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -467,10 +467,10 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt
     props["IceMX.Metrics.View.GroupBy"] = "none";
     updateProps(clientProps, serverProps, update.get(), props);
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     int threadCount = 4;
 #else
-    int threadCount = 3; // No endpoint host resolver thread with WinRT.
+    int threadCount = 3; // No endpoint host resolver thread with UWP.
 #endif
 
     Ice::Long timestamp;
@@ -774,10 +774,10 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt
         cout << "ok" << endl;
 
         //
-        // Ice doesn't do any endpoint lookup with WinRT, the WinRT
+        // Ice doesn't do any endpoint lookup with UWP, the UWP
         // runtime takes care of if.
         //
-#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0
+#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0
         cout << "testing endpoint lookup metrics... " << flush;
 
         props["IceMX.Metrics.View.Map.EndpointLookup.GroupBy"] = "id";
@@ -1459,7 +1459,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt
     {
         test(obsv->connectionObserver->getTotal() > 0);
         test(obsv->connectionEstablishmentObserver->getTotal() > 0);
-#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0
+#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0
         test(obsv->endpointLookupObserver->getTotal() > 0);
 #endif
         test(obsv->invocationObserver->remoteObserver->getTotal() > 0);
@@ -1476,7 +1476,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt
     {
         test(obsv->connectionObserver->getCurrent() > 0);
         test(obsv->connectionEstablishmentObserver->getCurrent() == 0);
-#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0
+#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0
         test(obsv->endpointLookupObserver->getCurrent() == 0);
 #endif
         waitForCurrent(obsv->invocationObserver->remoteObserver, 0);
@@ -1499,7 +1499,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt
     {
         test(obsv->connectionObserver->getFailedCount() > 0);
         test(obsv->connectionEstablishmentObserver->getFailedCount() > 0);
-#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0
+#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0
         test(obsv->endpointLookupObserver->getFailedCount() > 0);
 #endif
     }
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 4d37a3e2eaa..097b88c5fd2 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
     Test::MyClassPrxPtr myClass = allTests(communicator);
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     myClass->shutdown();
     cout << "testing server shutdown... " << flush;
     try
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index cce8c4cdbf8..6e8d963f798 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -1738,7 +1738,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p)
             test(r == ctx);
         }
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
         if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt")
         {
             //
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 4731ece4dce..fbc1158d2e3 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -2456,7 +2456,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 #endif
         }
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
         if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt")
         {
             //
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp
index 2a677456bbe..69277632d4c 100644
--- a/cpp/test/Ice/plugin/Client.cpp
+++ b/cpp/test/Ice/plugin/Client.cpp
@@ -93,8 +93,8 @@ main(int argc, char* argv[])
     //
     // Plugin directory is provided as the last argument
     //
-#if defined(ICE_OS_WINRT)
-    string pluginDir = "plugins/winrt/";
+#if defined(ICE_OS_UWP)
+    string pluginDir = "plugins/uwp/";
 #else
     string pluginDir = argv[argc - 1];
     pluginDir += "/";
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index b9945f8d724..8356acbf1cf 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -149,7 +149,7 @@ allTests(const CommunicatorPtr& communicator)
     }
     base = communicator->stringToProxy("test -d:" + endpoint);
     TestIntfPrxPtr objMcast = ICE_UNCHECKED_CAST(TestIntfPrx, base);
-#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || (defined(__APPLE__) && !TARGET_OS_IPHONE))
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || (defined(__APPLE__) && !TARGET_OS_IPHONE))
     cout << "testing udp multicast... " << flush;
 
     nRetry = 5;
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index a7e28f9599d..735db704c75 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -21,7 +21,7 @@
 #  if TARGET_OS_IPHONE != 0
 #    include <IceSSL/Util.h> // For loadCertificateChain
 #  endif
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
 #  include <ppltasks.h>
 #  include <nserror.h>
 using namespace concurrency;
@@ -75,7 +75,7 @@ readFile(const string& file, vector<char>& buffer)
     }
 }
 
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
 
 //
 // Helper methods to install a remove certificates from the Application store.
@@ -452,9 +452,9 @@ public:
             }
 
             //
-            // WinRT Certificate API doesn't provide the Issuer alternative name
+            // UWP Certificate API doesn't provide the Issuer alternative name
             //
-#  ifndef ICE_OS_WINRT
+#  ifndef ICE_OS_UWP
             //
             // Issuer alternative name
             //
@@ -624,7 +624,7 @@ createClientProps(const Ice::PropertiesPtr& defaultProps, const string& defaultD
     Ice::PropertiesPtr properties;
 
     properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
 
     //
     // Remove any CA certificates previously used by this test
@@ -746,7 +746,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 //
 // Anonymous cipher are not supported with SChannel or UWP
 //
-#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_UWP)
     {
         InitializationData initData;
         initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
@@ -903,7 +903,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         server = fact->createServer(d);
         try
         {
-#ifdef  ICE_OS_WINRT
+#ifdef  ICE_OS_UWP
             IceSSL::CertificatePtr clientCert = IceSSL::Certificate::load("ms-appx:///c_rsa_ca1_pub.pem");
             Ice::Context ctx;
             ctx["uwp"] = "1";
@@ -920,7 +920,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
             //
             // Validate some aspects of the Certificate class.
             //
-#ifdef  ICE_OS_WINRT
+#ifdef  ICE_OS_UWP
             IceSSL::CertificatePtr serverCert = IceSSL::Certificate::load("ms-appx:///s_rsa_ca1_pub.pem");
 #else
             IceSSL::CertificatePtr serverCert = IceSSL::Certificate::load(defaultDir + "/s_rsa_ca1_pub.pem");
@@ -937,7 +937,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #   endif
 #endif
 
-#ifdef  ICE_OS_WINRT
+#ifdef  ICE_OS_UWP
             IceSSL::CertificatePtr caCert = IceSSL::Certificate::load("ms-appx:///cacert1.pem");
             IceSSL::CertificatePtr caCert2 = IceSSL::Certificate::load("ms-appx:///cacert2.pem");
 #else
@@ -956,10 +956,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #endif
 
             //
-            // IceSSL implementation for WinRT doesn't support to validate a certificate
+            // IceSSL implementation for UWP doesn't support to validate a certificate
             // with a custom CA.
             //
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
             test(!serverCert->verify(serverCert));
             test(serverCert->verify(caCert));
             test(!serverCert->verify(caCert2));
@@ -989,10 +989,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #endif
 
             //
-            // IceSSL implementation for WinRT doesn't support to validate a certificate
+            // IceSSL implementation for UWP doesn't support to validate a certificate
             // with a custom CA.
             //
-#ifndef  ICE_OS_WINRT
+#ifndef  ICE_OS_UWP
             test(info->nativeCerts[0]->verify(info->nativeCerts[1]));
 #endif
             test(info->nativeCerts.size() == 2 &&
@@ -1014,7 +1014,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         server = fact->createServer(d);
         try
         {
-#ifdef  ICE_OS_WINRT
+#ifdef  ICE_OS_UWP
             IceSSL::CertificatePtr clientCert = IceSSL::Certificate::load("ms-appx:///c_rsa_ca1_pub.pem");
             Ice::Context ctx;
             ctx["uwp"] = "1";
@@ -1310,7 +1310,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
             try
             {
                 info = ICE_DYNAMIC_CAST(IceSSL::NativeConnectionInfo, server->ice_getConnection()->getInfo());
-#if defined(ICE_USE_SCHANNEL) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_SCHANNEL) || defined(ICE_OS_UWP)
                 test(info->nativeCerts.size() == 1); // SChannel never sends the root certificate
 #else
                 test(info->nativeCerts.size() == 2);
@@ -1358,10 +1358,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         comm->destroy();
 
         //
-        // With WinRT the following tests that use an intermediate CA fails with
+        // With UWP the following tests that use an intermediate CA fails with
         // ChainValidationResult::IncompleteChain
         //
-#ifndef  ICE_OS_WINRT
+#ifndef  ICE_OS_UWP
         //
         // Try certificate with one intermediate and VerifyDepthMax=2
         //
@@ -1541,7 +1541,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 //
 // Anonymous ciphers are not supported with SChannel.
 //
-#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_UWP)
         //
         // ADH is allowed but will not have a certificate.
         //
@@ -1660,9 +1660,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
     cout << "ok" << endl;
 
     //
-    // IceSSL.Protocols is not supported with WinRT
+    // IceSSL.Protocols is not supported with UWP
     //
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     cout << "testing protocols... " << flush;
     {
 #  ifndef ICE_USE_SECURE_TRANSPORT
@@ -1947,7 +1947,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         //
 #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
         {
-#  ifdef ICE_OS_WINRT
+#  ifdef ICE_OS_UWP
             IceSSL::CertificatePtr cert = IceSSL::Certificate::load("ms-appx:///s_rsa_ca1_exp_pub.pem");
 #  else
             IceSSL::CertificatePtr cert = IceSSL::Certificate::load(defaultDir + "/s_rsa_ca1_exp_pub.pem");
@@ -1985,7 +1985,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         //
 #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
         {
-#  ifdef ICE_OS_WINRT
+#  ifdef ICE_OS_UWP
             IceSSL::CertificatePtr cert = IceSSL::Certificate::load("ms-appx:///c_rsa_ca1_exp_pub.pem");
 #  else
             IceSSL::CertificatePtr cert = IceSSL::Certificate::load(defaultDir + "/c_rsa_ca1_exp_pub.pem");
@@ -2051,9 +2051,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #endif
 
     //
-    // IceSSL.CAs is not supported with WinRT
+    // IceSSL.CAs is not supported with UWP
     //
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     cout << "testing multiple CA certificates... " << flush;
     {
         InitializationData initData;
@@ -2080,9 +2080,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #endif
 
     //
-    // OpenSSL must use PEM certificate, WinRT doesn't support IceSSL.CAs
+    // OpenSSL must use PEM certificate, UWP doesn't support IceSSL.CAs
     //
-#if !defined(ICE_USE_OPENSSL) && !defined(ICE_OS_WINRT)
+#if !defined(ICE_USE_OPENSSL) && !defined(ICE_OS_UWP)
     cout << "testing DER CA certificate... " << flush;
     {
         InitializationData initData;
@@ -2158,7 +2158,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         //
         // Use an incorrect password and check that retries are attempted.
         //
-#ifdef  ICE_OS_WINRT
+#ifdef  ICE_OS_UWP
         removePersonalCertificate();
 #endif
         initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_pass_ca1", "cacert1");
@@ -2199,9 +2199,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #endif
 
     //
-    // IceSSL.Ciphers is not implemented with WinRT
+    // IceSSL.Ciphers is not implemented with UWP
     //
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     cout << "testing ciphers... " << flush;
 #  ifndef ICE_USE_SCHANNEL
     {
@@ -2593,9 +2593,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 
     cout << "testing IceSSL.TrustOnly... " << flush;
     //
-    // WinRT only provides the Subject and Issuer CN and not the full Subject and Issuer DNs,
+    // UWP only provides the Subject and Issuer CN and not the full Subject and Issuer DNs,
     // this implies that we can only do a limited range of checks with IceSSL.TrustOnly
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     //
     // iOS support only provides access to the CN of the certificate so we
     // can't check for other attributes
@@ -2840,7 +2840,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         comm->destroy();
     }
 
-#ifndef  ICE_OS_WINRT
+#ifndef  ICE_OS_UWP
     {
         InitializationData initData;
         initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
@@ -3022,7 +3022,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         comm->destroy();
     }
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     {
         //
         // Rejection takes precedence (client).
@@ -3076,7 +3076,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
     cout << "ok" << endl;
 
     cout << "testing IceSSL.TrustOnly.Client... " << flush;
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     {
         InitializationData initData;
         initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
@@ -3532,7 +3532,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
             }
         }
         cout << "ok" << endl;
-#elif defined(ICE_OS_WINRT)
+#elif defined(ICE_OS_UWP)
         cout << "testing IceSSL.FindCert... " << flush;
         const char* clientFindCertProperties[] =
         {
@@ -3758,10 +3758,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
 #endif
     }
 
-#if !defined(_AIX) && !defined(ICE_OS_WINRT)
+#if !defined(_AIX) && !defined(ICE_OS_UWP)
     // On AIX 6.1, the default root certificates don't validate demo.zeroc.com
-    // WinRT application manifest is not configure to use system CAs and IceSSL.UsePlatformCAs
-    // is not supported with WinRT
+    // UWP application manifest is not configure to use system CAs and IceSSL.UsePlatformCAs
+    // is not supported with UWP
     cout << "testing system CAs... " << flush;
     {
         {
diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp
index 765122fd874..631cefff11e 100644
--- a/cpp/test/IceSSL/configuration/Client.cpp
+++ b/cpp/test/IceSSL/configuration/Client.cpp
@@ -35,7 +35,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     {
         cerr << "testing with PKCS12 certificates..." << endl;
         Test::ServerFactoryPrxPtr factory = allTests(communicator, testdir, true);
-#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_WINRT)
+#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_UWP)
         cerr << "testing with PEM certificates..." << endl;
         factory = allTests(communicator, testdir, false);
 #endif
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index e9c34484361..de0ef4c7f61 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -20,7 +20,7 @@
 #include <Ice/ProxyF.h>
 #include <Ice/Initialize.h>
 
-#if defined(ICE_OS_WINRT) || (TARGET_OS_IPHONE != 0)
+#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0)
 #   include <Ice/Initialize.h>
 #   include <Ice/Logger.h>
 #   include <Ice/LocalException.h>
@@ -57,7 +57,7 @@ TEST_API std::string getTestHost(const Ice::PropertiesPtr&);
 TEST_API int getTestPort(const Ice::PropertiesPtr&, int);
 TEST_API Ice::InitializationData getTestInitData(int&, char*[]);
 
-#if !defined(ICE_OS_WINRT) && (TARGET_OS_IPHONE == 0)
+#if !defined(ICE_OS_UWP) && (TARGET_OS_IPHONE == 0)
 
 void
 inline testFailed(const char* expr, const char* file, unsigned int line)
diff --git a/cpp/test/uwp/MainPage.xaml b/cpp/test/uwp/MainPage.xaml
index 23aea94ff2c..7f596764265 100644
--- a/cpp/test/uwp/MainPage.xaml
+++ b/cpp/test/uwp/MainPage.xaml
@@ -71,7 +71,7 @@
                                       x:Name="Language"
                                       SelectedIndex="0"
                                       SelectionChanged="Language_SelectionChanged">
-                                <ComboBoxItem Name="winrt">winrt</ComboBoxItem>
+                                <ComboBoxItem Name="uwp">UWP</ComboBoxItem>
                                 <ComboBoxItem Name="cpp">C++</ComboBoxItem>
                                 <ComboBoxItem Name="csharp">C#</ComboBoxItem>
                                 <ComboBoxItem Name="java">Java</ComboBoxItem>
diff --git a/cpp/test/uwp/MainPage.xaml.cpp b/cpp/test/uwp/MainPage.xaml.cpp
index 5a2ad8c9dc8..fcb16d1c9a2 100644
--- a/cpp/test/uwp/MainPage.xaml.cpp
+++ b/cpp/test/uwp/MainPage.xaml.cpp
@@ -169,7 +169,7 @@ vector<TestSuiteDesc> allTests(string remoteServerLang)
         { "Ice/timeout" },
     };
 
-    if(remoteServerLang == "winrt")
+    if(remoteServerLang == "uwp")
     {
         all.push_back({ "Ice/metrics", {
                 { "client/server" },
@@ -544,7 +544,7 @@ TestRunner::run()
                 assert(!p->client.empty());
                 if(!p->server.empty())
                 {
-                    if(_config.mapping == "winrt")
+                    if(_config.mapping == "uwp")
                     {
                         runClientServerTest(*p);
                     }
@@ -792,7 +792,7 @@ MainPage::completed()
             {
                 _testSuites->IsEnabled = true;
                 _protocol->IsEnabled = true;
-                if(selectedLanguage() != "winrt")
+                if(selectedLanguage() != "uwp")
                 {
                     _host->IsEnabled = true;
                 }
@@ -887,7 +887,7 @@ void
 TestSuite::MainPage::initializeSupportedProtocols()
 {
     _protocols->Clear();
-    if(selectedLanguage() == "winrt")
+    if(selectedLanguage() == "uwp")
     {
         _protocols->Append("tcp");
         _protocols->Append("ws");
@@ -907,7 +907,7 @@ TestSuite::MainPage::initializeSupportedProtocols()
 std::string
 TestSuite::MainPage::selectedProtocol()
 {
-    if(selectedLanguage() == "winrt")
+    if(selectedLanguage() == "uwp")
     {
         const char* protocols[] = { "tcp", "ws" };
         assert(_protocol->SelectedIndex < sizeof(protocols) / sizeof(const char*));
@@ -923,7 +923,7 @@ TestSuite::MainPage::selectedProtocol()
 std::string
 TestSuite::MainPage::selectedLanguage()
 {
-    static const char* languages[] = {"winrt", "cpp", "csharp", "java"};
+    static const char* languages[] = {"uwp", "cpp", "csharp", "java"};
     assert(_language->SelectedIndex < sizeof(languages) / sizeof(const char*));
     return languages[_language->SelectedIndex];
 }
@@ -933,7 +933,7 @@ TestSuite::MainPage::Language_SelectionChanged(Platform::Object^ sender, Selecti
 {
     if(_language)
     {
-        _host->IsEnabled = selectedLanguage() != "winrt";
+        _host->IsEnabled = selectedLanguage() != "uwp";
         initializeSupportedTests();
         initializeSupportedProtocols();
     }