diff --git a/Makefile b/Makefile
index 3baae7b..5609f0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PROJECT_NAME := mkrwifi1010-fw
+PROJECT_NAME := nina-fw
 
 EXTRA_COMPONENT_DIRS := $(PWD)/arduino
 
diff --git a/README.md b/README.md
index 0a477ae..0f31fa7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# MKR WiFi 1010: NINA-W102 firmware
+# Arduino NINA-W102 firmware
 
 This firmware uses [Espressif's IDF](https://github.com/espressif/esp-idf)
 
@@ -14,7 +14,7 @@ This firmware uses [Espressif's IDF](https://github.com/espressif/esp-idf)
 
 ## License
 
-Copyright (c) 2018 Arduino AG. All right reserved.
+Copyright (c) 2018 Arduino SA. All rights reserved.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/Arduino.h b/arduino/cores/esp32/Arduino.h
index 0ad6923..c095e2e 100644
--- a/arduino/cores/esp32/Arduino.h
+++ b/arduino/cores/esp32/Arduino.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/WInterrupts.c b/arduino/cores/esp32/WInterrupts.c
index 2a9f560..640bc7d 100644
--- a/arduino/cores/esp32/WInterrupts.c
+++ b/arduino/cores/esp32/WInterrupts.c
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/WInterrupts.h b/arduino/cores/esp32/WInterrupts.h
index 24fe376..8d64d09 100644
--- a/arduino/cores/esp32/WInterrupts.h
+++ b/arduino/cores/esp32/WInterrupts.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/WMath.cpp b/arduino/cores/esp32/WMath.cpp
index f754453..4431d65 100644
--- a/arduino/cores/esp32/WMath.cpp
+++ b/arduino/cores/esp32/WMath.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/WMath.h b/arduino/cores/esp32/WMath.h
index 454fbac..0a662a8 100644
--- a/arduino/cores/esp32/WMath.h
+++ b/arduino/cores/esp32/WMath.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/delay.c b/arduino/cores/esp32/delay.c
index 2377884..51aa8bf 100644
--- a/arduino/cores/esp32/delay.c
+++ b/arduino/cores/esp32/delay.c
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/delay.h b/arduino/cores/esp32/delay.h
index cf877c9..dffc2b5 100644
--- a/arduino/cores/esp32/delay.h
+++ b/arduino/cores/esp32/delay.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/main.cpp b/arduino/cores/esp32/main.cpp
index 420a6ef..05000fd 100644
--- a/arduino/cores/esp32/main.cpp
+++ b/arduino/cores/esp32/main.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/wiring.c b/arduino/cores/esp32/wiring.c
index d0cdeee..d0ec63e 100644
--- a/arduino/cores/esp32/wiring.c
+++ b/arduino/cores/esp32/wiring.c
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/wiring_analog.c b/arduino/cores/esp32/wiring_analog.c
index cc5b363..f81a1b9 100644
--- a/arduino/cores/esp32/wiring_analog.c
+++ b/arduino/cores/esp32/wiring_analog.c
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/wiring_analog.h b/arduino/cores/esp32/wiring_analog.h
index a04b58b..39a734b 100644
--- a/arduino/cores/esp32/wiring_analog.h
+++ b/arduino/cores/esp32/wiring_analog.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/wiring_digital.c b/arduino/cores/esp32/wiring_digital.c
index a38cfe0..03e509a 100644
--- a/arduino/cores/esp32/wiring_digital.c
+++ b/arduino/cores/esp32/wiring_digital.c
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/cores/esp32/wiring_digital.h b/arduino/cores/esp32/wiring_digital.h
index 0aabef4..7bc1e8e 100644
--- a/arduino/cores/esp32/wiring_digital.h
+++ b/arduino/cores/esp32/wiring_digital.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/SPIS/src/SPIS.cpp b/arduino/libraries/SPIS/src/SPIS.cpp
index 341b18d..a692c61 100644
--- a/arduino/libraries/SPIS/src/SPIS.cpp
+++ b/arduino/libraries/SPIS/src/SPIS.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/SPIS/src/SPIS.h b/arduino/libraries/SPIS/src/SPIS.h
index 9065351..6d197a5 100644
--- a/arduino/libraries/SPIS/src/SPIS.h
+++ b/arduino/libraries/SPIS/src/SPIS.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFi.cpp b/arduino/libraries/WiFi/src/WiFi.cpp
index d32aa19..cd44c59 100644
--- a/arduino/libraries/WiFi/src/WiFi.cpp
+++ b/arduino/libraries/WiFi/src/WiFi.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFi.h b/arduino/libraries/WiFi/src/WiFi.h
index 092ffd0..308c9c0 100644
--- a/arduino/libraries/WiFi/src/WiFi.h
+++ b/arduino/libraries/WiFi/src/WiFi.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiClient.cpp b/arduino/libraries/WiFi/src/WiFiClient.cpp
index 9c96f02..9dc06be 100644
--- a/arduino/libraries/WiFi/src/WiFiClient.cpp
+++ b/arduino/libraries/WiFi/src/WiFiClient.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiClient.h b/arduino/libraries/WiFi/src/WiFiClient.h
index 2c54e9a..64332b6 100644
--- a/arduino/libraries/WiFi/src/WiFiClient.h
+++ b/arduino/libraries/WiFi/src/WiFiClient.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp
index 4772187..d88c5d4 100644
--- a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp
+++ b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiSSLClient.h b/arduino/libraries/WiFi/src/WiFiSSLClient.h
index eb21263..965245b 100644
--- a/arduino/libraries/WiFi/src/WiFiSSLClient.h
+++ b/arduino/libraries/WiFi/src/WiFiSSLClient.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiServer.cpp b/arduino/libraries/WiFi/src/WiFiServer.cpp
index 687174e..0f1bc83 100644
--- a/arduino/libraries/WiFi/src/WiFiServer.cpp
+++ b/arduino/libraries/WiFi/src/WiFiServer.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiServer.h b/arduino/libraries/WiFi/src/WiFiServer.h
index 3bd759e..fe45de3 100644
--- a/arduino/libraries/WiFi/src/WiFiServer.h
+++ b/arduino/libraries/WiFi/src/WiFiServer.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiUdp.cpp b/arduino/libraries/WiFi/src/WiFiUdp.cpp
index 641c0bb..5427131 100644
--- a/arduino/libraries/WiFi/src/WiFiUdp.cpp
+++ b/arduino/libraries/WiFi/src/WiFiUdp.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/arduino/libraries/WiFi/src/WiFiUdp.h b/arduino/libraries/WiFi/src/WiFiUdp.h
index e61864b..98c025c 100644
--- a/arduino/libraries/WiFi/src/WiFiUdp.h
+++ b/arduino/libraries/WiFi/src/WiFiUdp.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp
index 6a84dc9..5332579 100644
--- a/main/CommandHandler.cpp
+++ b/main/CommandHandler.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/main/CommandHandler.h b/main/CommandHandler.h
index e58f4a4..8961e8d 100644
--- a/main/CommandHandler.h
+++ b/main/CommandHandler.h
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
diff --git a/main/sketch.ino.cpp b/main/sketch.ino.cpp
index a14b57a..89273f2 100644
--- a/main/sketch.ino.cpp
+++ b/main/sketch.ino.cpp
@@ -1,6 +1,6 @@
 /*
-  This file is part of the MKR WiFi 1010 firmware.
-  Copyright (C) 2018  Arduino AG (http://www.arduino.cc/)
+  This file is part of the Arduino NINA firmware.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public