diff --git a/examples/apps/windows/MainPage.xaml.cpp b/examples/apps/windows/MainPage.xaml.cpp
index 95dffef50..5c0e84e1b 100644
--- a/examples/apps/windows/MainPage.xaml.cpp
+++ b/examples/apps/windows/MainPage.xaml.cpp
@@ -161,9 +161,9 @@ void MainPage::ShowInterfaceDetails(otAdapter^ adapter)
 {
     try
     {
-        InterfaceMacAddress->Text = otApi::ToString(adapter->ExtendedAddress);
+        InterfaceMacAddress->Text = otApi::MacToString(adapter->ExtendedAddress);
         InterfaceML_EID->Text = adapter->MeshLocalEid->ToString();
-        InterfaceRLOC->Text = otApi::ToString(adapter->Rloc16);
+        InterfaceRLOC->Text = otApi::Rloc16ToString(adapter->Rloc16);
 
         if (adapter->State > otThreadState::Child)
         {
@@ -259,7 +259,7 @@ void MainPage::AddAdapterToList(otAdapter^ adapter)
             [=]() {
                 GUID interfaceGuid = adapter->InterfaceGuid;
                 auto state = adapter->State;
-                auto stateStr = otApi::ToString(adapter->State);
+                auto stateStr = otApi::ThreadStateToString(adapter->State);
 
                 WCHAR szText[256] = { 0 };
                 swprintf_s(szText, 256, GUID_FORMAT L"\r\n\t%s\r\n\t%s",
diff --git a/examples/apps/windows/otApi.h b/examples/apps/windows/otApi.h
index e4d9d4eac..703a05442 100644
--- a/examples/apps/windows/otApi.h
+++ b/examples/apps/windows/otApi.h
@@ -152,7 +152,7 @@ public:
     }
 
     // Helper function to convert mac address to string
-    static String^ ToString(uint64_t mac)
+    static String^ MacToString(uint64_t mac)
     {
         WCHAR szMac[64] = { 0 };
         swprintf_s(szMac, 64, MAC8_FORMAT, MAC8_ARG(((UCHAR*)&mac)));
@@ -160,7 +160,7 @@ public:
     }
 
     // Helper function to convert RLOC16/PANID to string
-    static String^ ToString(uint16_t rloc)
+    static String^ Rloc16ToString(uint16_t rloc)
     {
         WCHAR szRloc[16] = { 0 };
         swprintf_s(szRloc, 16, L"0x%X", rloc);
@@ -168,7 +168,7 @@ public:
     }
 
     // Helper function to convert state to string
-    static String^ ToString(otThreadState state)
+    static String^ ThreadStateToString(otThreadState state)
     {
         switch (state)
         {
diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp
index 163b5b424..bc48c7502 100644
--- a/src/ncp/ncp_base.cpp
+++ b/src/ncp/ncp_base.cpp
@@ -691,10 +691,10 @@ void NcpBase::HandleRawFrame(const RadioPacket *aFrame)
             SPINEL_DATATYPE_INT8_S
             SPINEL_DATATYPE_UINT16_S
             SPINEL_DATATYPE_STRUCT_S( // PHY-data
-                // Empty for now
+                "" // Empty for now
             )
             SPINEL_DATATYPE_STRUCT_S( // Vendor-data
-                // Empty for now
+                "" // Empty for now
             ),
             aFrame->mPower,   // TX Power
             -128,             // Noise Floor (Currently unused)