diff --git a/packages/xod-arduino/platform/program.tpl.cpp b/packages/xod-arduino/platform/program.tpl.cpp
index 047270e06..c3790f2a4 100644
--- a/packages/xod-arduino/platform/program.tpl.cpp
+++ b/packages/xod-arduino/platform/program.tpl.cpp
@@ -88,7 +88,7 @@ Node_{{ id }} node_{{ id }} = Node_{{ id }}(
 namespace detail {
 void handleDebugProtocolMessages() {
     {{#withTetheringInetNode nodes}}
-    bool tetheringInetNodeReceivingData = xod__debug__tethering_inet::TetheringInternet::isReceiving();
+    bool tetheringInetNodeReceivingData = xod::tethering_inet::TetheringInternet::isReceiving();
     {{/withTetheringInetNode}}
     bool rewindToEol = true;
 
@@ -104,7 +104,7 @@ void handleDebugProtocolMessages() {
         switch (tweakedNodeId) {
           {{#withTetheringInetNode nodes}}
             case {{ id }}:
-              xod__debug__tethering_inet::TetheringInternet::beginReceiving(XOD_DEBUG_SERIAL.parseInt());
+              xod::tethering_inet::TetheringInternet::beginReceiving(XOD_DEBUG_SERIAL.parseInt());
               rewindToEol = false;
               XOD_DEBUG_SERIAL.read(); // :
               // The rest of data should be read by nodes
diff --git a/workspace/__lib__/xod/debug/get-local-ip/patch.cpp b/workspace/__lib__/xod/debug/get-local-ip/patch.cpp
index 28ebe35f3..20ac97e60 100644
--- a/workspace/__lib__/xod/debug/get-local-ip/patch.cpp
+++ b/workspace/__lib__/xod/debug/get-local-ip/patch.cpp
@@ -7,7 +7,7 @@ node {
             return;
 
         auto inet = getValue<input_INET>(ctx);
-        ValueType<output_IP>::T ip = inet->getIP();
+        typeof_IP ip = inet->getIP();
         if (ip == 0) {
             raiseError(ctx);
             return;