diff --git a/src/modules/XBee/XBee.cpp b/src/modules/XBee/XBee.cpp
index 9b1abe73..37d51530 100644
--- a/src/modules/XBee/XBee.cpp
+++ b/src/modules/XBee/XBee.cpp
@@ -34,7 +34,7 @@ int16_t XBee::begin(long speed) {
       RADIOLIB_DEBUG_PRINTLN(state);
       RADIOLIB_DEBUG_PRINTLN(F("Resetting ..."));
       reset();
-      delay(10);
+      Module::delay(10);
       _mod->ATemptyBuffer();
       i++;
     }
@@ -51,10 +51,10 @@ int16_t XBee::begin(long speed) {
 }
 
 void XBee::reset() {
-  pinMode(_mod->getRst(), OUTPUT);
-  digitalWrite(_mod->getRst(), LOW);
-  delay(1);
-  digitalWrite(_mod->getRst(), HIGH);
+  Module::pinMode(_mod->getRst(), OUTPUT);
+  Module::digitalWrite(_mod->getRst(), LOW);
+  Module::delay(1);
+  Module::digitalWrite(_mod->getRst(), HIGH);
 }
 
 int16_t XBee::transmit(uint8_t* dest, const char* payload, uint8_t radius) {
@@ -216,11 +216,11 @@ int16_t XBeeSerial::begin(long speed) {
 }
 
 void XBeeSerial::reset() {
-  pinMode(_mod->getRst(), OUTPUT);
-  digitalWrite(_mod->getRst(), LOW);
-  delay(1);
-  digitalWrite(_mod->getRst(), HIGH);
-  pinMode(_mod->getRst(), INPUT);
+  Module::pinMode(_mod->getRst(), OUTPUT);
+  Module::digitalWrite(_mod->getRst(), LOW);
+  Module::delay(1);
+  Module::digitalWrite(_mod->getRst(), HIGH);
+  Module::pinMode(_mod->getRst(), INPUT);
 }
 
 int16_t XBeeSerial::setDestinationAddress(const char* destinationAddressHigh, const char* destinationAddressLow) {
@@ -308,13 +308,13 @@ int16_t XBeeSerial::setPanId(const char* panId) {
 
 bool XBeeSerial::enterCmdMode() {
   for(uint8_t i = 0; i < 10; i++) {
-    delay(1000);
+    Module::delay(1000);
 
     _mod->ModuleSerial->write('+');
     _mod->ModuleSerial->write('+');
     _mod->ModuleSerial->write('+');
 
-    delay(1000);
+    Module::delay(1000);
 
     if(_mod->ATgetResponse()) {
       return(true);
@@ -403,10 +403,10 @@ int16_t XBee::readApiFrame(uint8_t frameID, uint8_t codePos, uint16_t timeout) {
   numBytes++;
 
   // wait until all response bytes are available (5s timeout)
-  uint32_t start = millis();
+  uint32_t start = Module::millis();
   while(_mod->ModuleSerial->available() < (int16_t)numBytes) {
-    yield();
-    if(millis() - start >= timeout/2) {
+    Module::yield();
+    if(Module::millis() - start >= timeout/2) {
       return(ERR_FRAME_MALFORMED);
     }
   }
@@ -455,10 +455,10 @@ int16_t XBee::readApiFrame(uint8_t frameID, uint8_t codePos, uint16_t timeout) {
 
 uint16_t XBee::getNumBytes(uint32_t timeout, size_t minBytes) {
   // wait for available data
-  uint32_t start = millis();
+  uint32_t start = Module::millis();
   while((size_t)_mod->ModuleSerial->available() < minBytes) {
-    yield();
-    if(millis() - start >= timeout) {
+    Module::yield();
+    if(Module::millis() - start >= timeout) {
       return(0);
     }
   }
@@ -468,7 +468,7 @@ uint16_t XBee::getNumBytes(uint32_t timeout, size_t minBytes) {
   uint8_t i = 0;
   RADIOLIB_DEBUG_PRINT(F("reading frame length: "));
   while(_mod->ModuleSerial->available() > 0) {
-    yield();
+    Module::yield();
     uint8_t b = _mod->ModuleSerial->read();
     RADIOLIB_DEBUG_PRINT(b, HEX);
     RADIOLIB_DEBUG_PRINT('\t');