diff --git a/src/KiteLib.cpp b/src/KiteLib.cpp
index 43aa4b83..c134af12 100644
--- a/src/KiteLib.cpp
+++ b/src/KiteLib.cpp
@@ -1,8 +1,8 @@
 #include "KiteLib.h"
 
 KiteShield::KiteShield() {
-  ModuleA = new Module(KITE_CS_A, KITE_TX_A, KITE_RX_A, KITE_INT_0, KITE_INT_1);
-  ModuleB = new Module(KITE_CS_B, KITE_TX_B, KITE_RX_B, KITE_INT_0, KITE_INT_1);
+  ModuleA = new Module(KITE_CS_A, KITE_RX_A, KITE_TX_A, KITE_INT_0, KITE_INT_1);
+  ModuleB = new Module(KITE_CS_B, KITE_RX_B, KITE_TX_B, KITE_INT_0, KITE_INT_1);
 }
 
 KiteShield Kite;
diff --git a/src/KiteLib.h b/src/KiteLib.h
index 9cf792a5..ad3c819a 100644
--- a/src/KiteLib.h
+++ b/src/KiteLib.h
@@ -29,11 +29,11 @@
 #include "protocols/MQTT.h"
 
 #define KITE_CS_A   10
-#define KITE_TX_A   9
-#define KITE_RX_A   8
+#define KITE_RX_A   9
+#define KITE_TX_A   8
 #define KITE_CS_B   5
-#define KITE_TX_B   7
-#define KITE_RX_B   6
+#define KITE_RX_B   7
+#define KITE_TX_B   6
 #define KITE_INT_0  2
 #define KITE_INT_1  3
 
diff --git a/src/Module.cpp b/src/Module.cpp
index 662a445e..365342c7 100644
--- a/src/Module.cpp
+++ b/src/Module.cpp
@@ -2,20 +2,20 @@
 
 Module::Module(int cs, int int0, int int1) {
   _cs = cs;
-  _tx = -1;
   _rx = -1;
+  _tx = -1;
   _int0 = int0;
   _int1 = int1;
 }
 
-Module::Module(int cs, int tx, int rx, int int0, int int1) {
+Module::Module(int cs, int rx, int tx, int int0, int int1) {
   _cs = cs;
-  _tx = tx;
   _rx = rx;
+  _tx = tx;
   _int0 = int0;
   _int1 = int1;
   
-  ModuleSerial = new SoftwareSerial(_tx, _rx);
+  ModuleSerial = new SoftwareSerial(_rx, _tx);
 }
 
 void Module::init(uint8_t interface, uint8_t gpio) {