diff --git a/bms-to-inverter-main/pom.xml b/bms-to-inverter-main/pom.xml
index fd97cb6..80201b0 100644
--- a/bms-to-inverter-main/pom.xml
+++ b/bms-to-inverter-main/pom.xml
@@ -265,7 +265,7 @@
 		<!-- ####################  GOODWE HV (CAN)  ################### -->
 		<dependency>
 			<groupId>com.ai-republic.bms-to-inverter</groupId>
-			<artifactId>inverter-goodwe-hv-can</artifactId>
+			<artifactId>inverter-goodwe-can</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		
diff --git a/configurator/pom.xml b/configurator/pom.xml
index 4cac278..9a6d607 100644
--- a/configurator/pom.xml
+++ b/configurator/pom.xml
@@ -234,7 +234,7 @@
 		<!-- ####################  GOODWE HV (CAN)  ################### -->
 		<dependency>
 			<groupId>com.ai-republic.bms-to-inverter</groupId>
-			<artifactId>inverter-goodwe-hv-can</artifactId>
+			<artifactId>inverter-goodwe-can</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/configurator/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor b/configurator/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
index a7d8b8f..ccf5079 100644
--- a/configurator/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
+++ b/configurator/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
@@ -1,7 +1,7 @@
 com.airepublic.bmstoinverter.inverter.dummy.DummyInverterDescriptor
 com.airepublic.bmstoinverter.inverter.deye.can.DeyeInverterCANDescriptor
 com.airepublic.bmstoinverter.inverter.huawei.modbus.HuaweiInverterModbusDescriptor
-com.airepublic.bmstoinverter.inverter.goodwehv.can.GoodweHVInverterCANDescriptor
+com.airepublic.bmstoinverter.inverter.goodwe.can.GoodweInverterCANDescriptor
 com.airepublic.bmstoinverter.inverter.growatt.can.GrowattInverterCANDescriptor
 com.airepublic.bmstoinverter.inverter.growatt.modbus.GrowattInverterModbusDescriptor
 com.airepublic.bmstoinverter.inverter.pylon.can.PylonInverterCANDescriptor
diff --git a/inverter-goodwe-hv-can/.gitignore b/inverter-goodwe-can/.gitignore
similarity index 100%
rename from inverter-goodwe-hv-can/.gitignore
rename to inverter-goodwe-can/.gitignore
diff --git a/inverter-goodwe-hv-can/pom.xml b/inverter-goodwe-can/pom.xml
similarity index 95%
rename from inverter-goodwe-hv-can/pom.xml
rename to inverter-goodwe-can/pom.xml
index 517f609..ae15454 100644
--- a/inverter-goodwe-hv-can/pom.xml
+++ b/inverter-goodwe-can/pom.xml
@@ -9,7 +9,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>inverter-goodwe-hv-can</artifactId>
+	<artifactId>inverter-goodwe-can</artifactId>
 
 	<name>${project.artifactId}-${project.version}</name>
 	<description>Module for the Goodwe HV inverter CAN support</description>
diff --git a/inverter-goodwe-hv-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwehv/can/GoodweHVInverterCANDescriptor.java b/inverter-goodwe-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwe/can/GoodweInverterCANDescriptor.java
similarity index 85%
rename from inverter-goodwe-hv-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwehv/can/GoodweHVInverterCANDescriptor.java
rename to inverter-goodwe-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwe/can/GoodweInverterCANDescriptor.java
index 24a2e9a..4743c41 100644
--- a/inverter-goodwe-hv-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwehv/can/GoodweHVInverterCANDescriptor.java
+++ b/inverter-goodwe-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwe/can/GoodweInverterCANDescriptor.java
@@ -8,7 +8,7 @@
  *
  * @author Torsten Oltmanns - bms-to-inverter''AT''gmail.com
  */
-package com.airepublic.bmstoinverter.inverter.goodwehv.can;
+package com.airepublic.bmstoinverter.inverter.goodwe.can;
 
 import com.airepublic.bmstoinverter.core.Inverter;
 import com.airepublic.bmstoinverter.core.InverterConfig;
@@ -19,10 +19,10 @@
 /**
  * The {@link InverterDescriptor} for the Goodwe HV {@link Inverter} using the CAN protocol.
  */
-public class GoodweHVInverterCANDescriptor implements InverterDescriptor {
+public class GoodweInverterCANDescriptor implements InverterDescriptor {
     @Override
     public String getName() {
-        return "GOODWE_HV_CAN";
+        return "GOODWE_CAN";
     }
 
 
@@ -34,7 +34,7 @@ public int getDefaultBaudRate() {
 
     @Override
     public Class<? extends Inverter> getInverterClass() {
-        return GoodweHVInverterCANProcessor.class;
+        return GoodweInverterCANProcessor.class;
     }
 
 
diff --git a/inverter-goodwe-hv-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwehv/can/GoodweHVInverterCANProcessor.java b/inverter-goodwe-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwe/can/GoodweInverterCANProcessor.java
similarity index 97%
rename from inverter-goodwe-hv-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwehv/can/GoodweHVInverterCANProcessor.java
rename to inverter-goodwe-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwe/can/GoodweInverterCANProcessor.java
index aa2a779..ce90578 100644
--- a/inverter-goodwe-hv-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwehv/can/GoodweHVInverterCANProcessor.java
+++ b/inverter-goodwe-can/src/main/java/com/airepublic/bmstoinverter/inverter/goodwe/can/GoodweInverterCANProcessor.java
@@ -8,7 +8,7 @@
  *
  * @author Torsten Oltmanns - bms-to-inverter''AT''gmail.com
  */
-package com.airepublic.bmstoinverter.inverter.goodwehv.can;
+package com.airepublic.bmstoinverter.inverter.goodwe.can;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -32,8 +32,8 @@
  * The class to handle CAN messages for a Goodwe HV {@link Inverter}.
  */
 @ApplicationScoped
-public class GoodweHVInverterCANProcessor extends Inverter {
-    private final static Logger LOG = LoggerFactory.getLogger(GoodweHVInverterCANProcessor.class);
+public class GoodweInverterCANProcessor extends Inverter {
+    private final static Logger LOG = LoggerFactory.getLogger(GoodweInverterCANProcessor.class);
 
     @Override
     protected List<ByteBuffer> createSendFrames(final ByteBuffer requestFrame, final BatteryPack aggregatedPack) {
diff --git a/inverter-goodwe-hv-can/src/main/resources/META-INF/beans.xml b/inverter-goodwe-can/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from inverter-goodwe-hv-can/src/main/resources/META-INF/beans.xml
rename to inverter-goodwe-can/src/main/resources/META-INF/beans.xml
diff --git a/inverter-goodwe-can/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor b/inverter-goodwe-can/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
new file mode 100644
index 0000000..8c18ecc
--- /dev/null
+++ b/inverter-goodwe-can/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
@@ -0,0 +1 @@
+com.airepublic.bmstoinverter.inverter.goodwe.can.GoodweInverterCANDescriptor
diff --git a/inverter-goodwe-hv-can/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor b/inverter-goodwe-hv-can/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
deleted file mode 100644
index 23e311f..0000000
--- a/inverter-goodwe-hv-can/src/main/resources/META-INF/services/com.airepublic.bmstoinverter.core.InverterDescriptor
+++ /dev/null
@@ -1 +0,0 @@
-com.airepublic.bmstoinverter.inverter.goodwehv.can.GoodweHVInverterCANDescriptor
diff --git a/pom.xml b/pom.xml
index 3917b9a..f518607 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 		<module>bms-to-inverter-main</module>
 		<module>inverter-deye-can</module>
 		<module>inverter-dummy</module>
-		<module>inverter-goodwe-hv-can</module>
+		<module>inverter-goodwe-can</module>
 		<module>inverter-growatt-can</module>
 		<module>inverter-growatt-modbus</module>
 		<module>inverter-growatt-rs485</module>