diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index cf471c3..bd4cb6b 100755
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -22,7 +22,7 @@ body:
           required: true
         - label: This issue only contains 1 issue (if you have multiple issues, open one issue for each issue).
           required: true
-        - label: This issue is not a duplicate issue of any [previous issues](https://github.com/ludeeus/panda_pwr/issues?q=is%3Aissue+label%3A%22Bug%22+)..
+        - label: This issue is not a duplicate issue of any [previous issues](https://github.com/juanillo62gm/panda_pwr/issues?q=is%3Aissue+label%3A%22Bug%22+)..
           required: true
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 7749435..e04d4da 100755
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -14,7 +14,7 @@ body:
           required: true
         - label: This only contains 1 feature request (if you have multiple feature requests, open one feature request for each feature request).
           required: true
-        - label: This issue is not a duplicate feature request of [previous feature requests](https://github.com/ludeeus/panda_pwr/issues?q=is%3Aissue+label%3A%22Feature+Request%22+).
+        - label: This issue is not a duplicate feature request of [previous feature requests](https://github.com/juanillo62gm/panda_pwr/issues?q=is%3Aissue+label%3A%22Feature+Request%22+).
           required: true
 
   - type: textarea
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4a4161e..0d73074 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ Use [black](https://github.com/ambv/black) to make sure the code follows the sty
 
 ## Test your code modification
 
-This custom component is based on [panda_pwr template](https://github.com/ludeeus/panda_pwr).
+This custom component is based on [panda_pwr template](https://github.com/juanillo62gm/panda_pwr).
 
 It comes with development environment in a container, easy to launch
 if you use Visual Studio Code. With this container you will have a stand alone
diff --git a/README.md b/README.md
index f9e2f2a..3ca5171 100755
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@
 
 Integrate your [Panda PWR from BIGTREETECH (BTT) | BIQU][pandapwrwiki] with Home Assistant.
 
-[![PandaPWRDevice](https://bttwiki.com/img/PandaPWR/interface.jpg)][pandapwrwiki]
-
+[![PandaPWRDevice](/assets/panda_pwr_hardware.jpeg)][pandapwrwiki]
 
 **This integration will set up the following platforms.**
 
diff --git a/assets/panda_pwr_hardware.jpeg b/assets/panda_pwr_hardware.jpeg
new file mode 100644
index 0000000..be1d3fd
Binary files /dev/null and b/assets/panda_pwr_hardware.jpeg differ
diff --git a/custom_components/pandapwr/__init__.py b/custom_components/panda_pwr/__init__.py
similarity index 100%
rename from custom_components/pandapwr/__init__.py
rename to custom_components/panda_pwr/__init__.py
diff --git a/custom_components/pandapwr/api.py b/custom_components/panda_pwr/api.py
similarity index 100%
rename from custom_components/pandapwr/api.py
rename to custom_components/panda_pwr/api.py
diff --git a/custom_components/pandapwr/binary_sensor.py b/custom_components/panda_pwr/binary_sensor.py
similarity index 100%
rename from custom_components/pandapwr/binary_sensor.py
rename to custom_components/panda_pwr/binary_sensor.py
diff --git a/custom_components/pandapwr/config_flow.py b/custom_components/panda_pwr/config_flow.py
similarity index 100%
rename from custom_components/pandapwr/config_flow.py
rename to custom_components/panda_pwr/config_flow.py
diff --git a/custom_components/panda_pwr/const.py b/custom_components/panda_pwr/const.py
new file mode 100644
index 0000000..bda870b
--- /dev/null
+++ b/custom_components/panda_pwr/const.py
@@ -0,0 +1,3 @@
+"""Constants for the panda_pwr integration."""
+
+DOMAIN = "panda_pwr"
diff --git a/custom_components/pandapwr/manifest.json b/custom_components/panda_pwr/manifest.json
similarity index 92%
rename from custom_components/pandapwr/manifest.json
rename to custom_components/panda_pwr/manifest.json
index 8dbf78d..e950b17 100644
--- a/custom_components/pandapwr/manifest.json
+++ b/custom_components/panda_pwr/manifest.json
@@ -1,5 +1,5 @@
 {
-  "domain": "pandapwr",
+  "domain": "panda_pwr",
   "name": "Panda PWR",
   "codeowners": ["@juanillo62gm"],
   "config_flow": true,
diff --git a/custom_components/pandapwr/sensor.py b/custom_components/panda_pwr/sensor.py
similarity index 100%
rename from custom_components/pandapwr/sensor.py
rename to custom_components/panda_pwr/sensor.py
diff --git a/custom_components/pandapwr/strings.json b/custom_components/panda_pwr/strings.json
similarity index 100%
rename from custom_components/pandapwr/strings.json
rename to custom_components/panda_pwr/strings.json
diff --git a/custom_components/pandapwr/switch.py b/custom_components/panda_pwr/switch.py
similarity index 100%
rename from custom_components/pandapwr/switch.py
rename to custom_components/panda_pwr/switch.py
diff --git a/custom_components/pandapwr/translations/en.json b/custom_components/panda_pwr/translations/en.json
similarity index 100%
rename from custom_components/pandapwr/translations/en.json
rename to custom_components/panda_pwr/translations/en.json
diff --git a/custom_components/pandapwr/translations/es.json b/custom_components/panda_pwr/translations/es.json
similarity index 100%
rename from custom_components/pandapwr/translations/es.json
rename to custom_components/panda_pwr/translations/es.json
diff --git a/custom_components/pandapwr/const.py b/custom_components/pandapwr/const.py
deleted file mode 100644
index a916d3c..0000000
--- a/custom_components/pandapwr/const.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Constants for the pandapwr integration."""
-
-DOMAIN = "pandapwr"