diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 0489863..d69786d 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -20,10 +20,11 @@ jobs:
       # libraries to install for all boards
       UNIVERSAL_LIBRARIES: |
         - source-path: ./
+        - name: Arduino_CloudUtils
         - name: Arduino_SecureElement
       # sketch paths to compile (recursive) for all boards
       UNIVERSAL_SKETCH_PATHS: |
-        - examples/boardID
+        - examples/uniqueHWId
       SKETCHES_REPORTS_PATH: sketches-reports
 
     strategy:
diff --git a/README.md b/README.md
index 41c825d..6a9dc7c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Arduino HardWare Unique Id
+# Arduino Unique Hardware Id
 
-This library contains a set of functionalities to compute the hardware unique Id
+This library contains a set of functionalities to compute the unique hardware Id
 of an Arduino board
\ No newline at end of file
diff --git a/examples/HWUniqueId/HWUniqueId.ino b/examples/uniqueHWId/uniqueHWId.ino
similarity index 91%
rename from examples/HWUniqueId/HWUniqueId.ino
rename to examples/uniqueHWId/uniqueHWId.ino
index 4bcb2f3..5b46204 100644
--- a/examples/HWUniqueId/HWUniqueId.ino
+++ b/examples/uniqueHWId/uniqueHWId.ino
@@ -8,13 +8,13 @@
     file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#include <Arduino_HWUniqueId.h>
+#include <Arduino_UniqueHWId.h>
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
-  HWUniqueId Id;
+  UniqueHWId Id;
   if(Id.begin()) {
     Serial.println(Id.get());
   } else {
diff --git a/library.properties b/library.properties
index 61e9d3f..b8ddac1 100644
--- a/library.properties
+++ b/library.properties
@@ -1,9 +1,11 @@
-name=Arduino_HWUniqueId
+name=Arduino_UniqueHWId
 version=0.0.1
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Utility module to compute hardware unique identity
+sentence=Utility module to compute unique hardware identity
 paragraph=
 category=Communication
-url=https://github.com/arduino-libraries/Arduino_HWUniqueId
+url=https://github.com/arduino-libraries/Arduino_UniqueHWId
 architectures=*
+includes=Arduino_UniqueHWId.h
+depends=Arduino_CloudUtils,Arduino_SecureElement
diff --git a/src/Arduino_HWUniqueId.h b/src/Arduino_UniqueHWId.h
similarity index 92%
rename from src/Arduino_HWUniqueId.h
rename to src/Arduino_UniqueHWId.h
index f175da7..49eea13 100644
--- a/src/Arduino_HWUniqueId.h
+++ b/src/Arduino_UniqueHWId.h
@@ -9,4 +9,4 @@
 */
 #pragma once
 
-#include "HWUniqueId.h"
+#include "uniqueHWId.h"
diff --git a/src/HWUniqueId.cpp b/src/uniqueHWId.cpp
similarity index 90%
rename from src/HWUniqueId.cpp
rename to src/uniqueHWId.cpp
index ecc3bac..eec6d9b 100644
--- a/src/HWUniqueId.cpp
+++ b/src/uniqueHWId.cpp
@@ -10,14 +10,14 @@
 
 #include <Arduino_SHA256.h>
 #include <Arduino_HEX.h>
-#include "HWUniqueId.h"
+#include "uniqueHWId.h"
 
-bool HWUniqueId::begin() {
+bool UniqueHWId::begin() {
     _init =_sId.begin() && _nId.begin();
     return _init;
 }
 
-bool HWUniqueId::get(uint8_t* in, uint32_t size) {
+bool UniqueHWId::get(uint8_t* in, uint32_t size) {
     if (_init == false || size < BOARD_PROVISIONING_ID_SIZE) {
         Serial.println("BOARD_PROVISIONING_ID_SIZE ERROR");
         return false;
@@ -40,7 +40,7 @@ bool HWUniqueId::get(uint8_t* in, uint32_t size) {
     return true;
 }
 
-String HWUniqueId::get() {
+String UniqueHWId::get() {
     uint8_t data[BOARD_PROVISIONING_ID_SIZE];
     if (!get(data, sizeof(data))) {
         return String("");
diff --git a/src/HWUniqueId.h b/src/uniqueHWId.h
similarity index 97%
rename from src/HWUniqueId.h
rename to src/uniqueHWId.h
index 897a5a0..13bf504 100644
--- a/src/HWUniqueId.h
+++ b/src/uniqueHWId.h
@@ -17,7 +17,7 @@
 /*
  * This class contains the methods to get board hardware unique id
  */
-class HWUniqueId {
+class UniqueHWId {
 
 public:
     static constexpr int BOARD_PROVISIONING_ID_SIZE  = UC_UID_SIZE +