diff --git a/generator/generator.py b/generator/generator.py
index eb4482b..f5d33a9 100755
--- a/generator/generator.py
+++ b/generator/generator.py
@@ -289,6 +289,19 @@ def generate_boards_json(input_data, arduino_cli_path, new_boards):
         if fqbn in old_boards:
             boards[fqbn]["loader_sketch"] = create_precomp_sketch_data(simple_fqbn, "loader")
             boards[fqbn]["version_sketch"] = create_precomp_sketch_data(simple_fqbn, "getversion")
+            boards[fqbn].update(create_upload_data(fqbn, installed_cores))
+            # Gets the old_board name
+            res = arduino_cli(
+                cli_path=arduino_cli_path,
+                args=["board", "search", fqbn, "--format", "json"],
+            )
+            for board in json.loads(res):
+                if board["fqbn"] == fqbn:
+                    boards[fqbn]["name"] = board["name"]
+                    break
+
+        else:
+            boards[fqbn]["name"] = data["name"]
 
         for firmware_version in data["versions"]:
             module = data["moduleName"]
@@ -296,19 +309,6 @@ def generate_boards_json(input_data, arduino_cli_path, new_boards):
             boards[fqbn]["firmware"].append(create_firmware_data(firmware_file, module, firmware_version))
             boards[fqbn]["module"] = module
 
-        res = arduino_cli(
-            cli_path=arduino_cli_path,
-            args=["board", "search", fqbn, "--format", "json"],
-        )
-        # Gets the board name
-        for board in json.loads(res):
-            if board["fqbn"] == fqbn:
-                boards[fqbn]["name"] = board["name"]
-                break
-
-        if fqbn in old_boards:
-            boards[fqbn].update(create_upload_data(fqbn, installed_cores))
-
     boards_json = []
     for _, b in boards.items():
         boards_json.append(b)
diff --git a/generator/new_boards.json b/generator/new_boards.json
index 758e535..4312630 100644
--- a/generator/new_boards.json
+++ b/generator/new_boards.json
@@ -1,6 +1,7 @@
 {
   "arduino:renesas_uno:unor4wifi": {
     "moduleName": "ESP32-S3",
-    "versions": ["0.1.0", "0.2.0", "0.2.1"]
+    "versions": ["0.1.0", "0.2.0", "0.2.1"],
+    "name": "Arduino UNO R4 WiFi"
   }
 }