diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h
index 7f1f5f369..70c008e32 100644
--- a/companion/src/firmwares/opentx/opentxinterface.h
+++ b/companion/src/firmwares/opentx/opentxinterface.h
@@ -13,12 +13,13 @@
  * GNU General Public License for more details.
  *
  */
-#ifndef open9x_interface_h
-#define open9x_interface_h
+
+#ifndef opentx_interface_h
+#define opentx_interface_h
 
 #include "eeprominterface.h"
 
-#define OPENTX_FIRMWARE_DOWNLOADS    "http://downloads-20.open-tx.org/firmware"
+#define OPENTX_FIRMWARE_DOWNLOADS    "http://downloads-21.open-tx.org/firmware"
 
 class RleFile;
 
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 72cfa5e4c..8d1ad4d7e 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -68,7 +68,7 @@
 #include "radiointerface.h"
 #include "progressdialog.h"
 
-#define OPENTX_COMPANION_DOWNLOADS   "http://downloads-20.open-tx.org/companion"
+#define OPENTX_COMPANION_DOWNLOADS   "http://downloads-21.open-tx.org/companion"
 #define DONATE_STR      "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"
 
 #ifdef __APPLE__