diff --git a/ATEM.cpp b/UIP_ATEM.cpp
similarity index 99%
rename from ATEM.cpp
rename to UIP_ATEM.cpp
index 113753d..c0fddca 100755
--- a/ATEM.cpp
+++ b/UIP_ATEM.cpp
@@ -24,7 +24,7 @@ with the ATEM library. If not, see http://www.gnu.org/licenses/.
   #include "WProgram.h"
 #endif
 
-#include "ATEM.h"
+#include "UIP_ATEM.h"
 
 
 /**
@@ -615,4 +615,4 @@ void ATEM::mediaPlayerSelectSource(uint8_t mediaPlayer, boolean movieclip, uint8
 		uint8_t commandBytes2[8] = {0x01, mediaPlayer-1, movieclip?2:1, 0xbf, movieclip?0x96:0xd5, 0xb6, 0x04, 0};
 		_sendCommandPacket("MPSS", commandBytes2, 8);
 	}
-}
\ No newline at end of file
+}
diff --git a/ATEM.h b/UIP_ATEM.h
similarity index 99%
rename from ATEM.h
rename to UIP_ATEM.h
index 704e2e7..74dc53a 100755
--- a/ATEM.h
+++ b/UIP_ATEM.h
@@ -34,7 +34,7 @@ with the ATEM library. If not, see http://www.gnu.org/licenses/.
 #endif
 
 
-#include <EthernetUdp.h>
+#include <UIPUdp.h>
 
 
 class ATEM