diff --git a/autovalue/README.md b/code-generation/README.md
similarity index 93%
rename from autovalue/README.md
rename to code-generation/README.md
index cdeed98e6d..289a336f99 100644
--- a/autovalue/README.md
+++ b/code-generation/README.md
@@ -1,8 +1,9 @@
-## AutoValue
+## Code Generation
 
 This module contains articles about automatic code generation
 
 ### Relevant Articles:
+
 - [Introduction to AutoValue](https://www.baeldung.com/introduction-to-autovalue)
 - [Introduction to AutoFactory](https://www.baeldung.com/autofactory)
 - [Google AutoService](https://www.baeldung.com/google-autoservice)
diff --git a/autovalue/pom.xml b/code-generation/pom.xml
similarity index 95%
rename from autovalue/pom.xml
rename to code-generation/pom.xml
index a10e8ef055..7aefc1b5b3 100644
--- a/autovalue/pom.xml
+++ b/code-generation/pom.xml
@@ -2,9 +2,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>autovalue</artifactId>
+    <artifactId>code-generation</artifactId>
     <version>1.0</version>
-    <name>autovalue</name>
+    <name>code-generation</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/App.java b/code-generation/src/main/java/com/baeldung/autofactory/App.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/App.java
rename to code-generation/src/main/java/com/baeldung/autofactory/App.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/CustomStorage.java b/code-generation/src/main/java/com/baeldung/autofactory/CustomStorage.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/CustomStorage.java
rename to code-generation/src/main/java/com/baeldung/autofactory/CustomStorage.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java b/code-generation/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java
rename to code-generation/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java b/code-generation/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java
rename to code-generation/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java b/code-generation/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java
rename to code-generation/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/model/Camera.java b/code-generation/src/main/java/com/baeldung/autofactory/model/Camera.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/model/Camera.java
rename to code-generation/src/main/java/com/baeldung/autofactory/model/Camera.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java b/code-generation/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java
rename to code-generation/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/model/Phone.java b/code-generation/src/main/java/com/baeldung/autofactory/model/Phone.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/model/Phone.java
rename to code-generation/src/main/java/com/baeldung/autofactory/model/Phone.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java b/code-generation/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java
rename to code-generation/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java b/code-generation/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
rename to code-generation/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
diff --git a/autovalue/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java b/code-generation/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java
rename to code-generation/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java
diff --git a/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java b/code-generation/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
rename to code-generation/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
diff --git a/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java b/code-generation/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
rename to code-generation/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
diff --git a/autovalue/src/main/java/com/baeldung/autoservice/TranslationService.java b/code-generation/src/main/java/com/baeldung/autoservice/TranslationService.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autoservice/TranslationService.java
rename to code-generation/src/main/java/com/baeldung/autoservice/TranslationService.java
diff --git a/autovalue/src/main/java/com/baeldung/autovalue/AutoValueMoney.java b/code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoney.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autovalue/AutoValueMoney.java
rename to code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoney.java
diff --git a/autovalue/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java b/code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java
rename to code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java
diff --git a/autovalue/src/main/java/com/baeldung/autovalue/Foo.java b/code-generation/src/main/java/com/baeldung/autovalue/Foo.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autovalue/Foo.java
rename to code-generation/src/main/java/com/baeldung/autovalue/Foo.java
diff --git a/autovalue/src/main/java/com/baeldung/autovalue/ImmutableMoney.java b/code-generation/src/main/java/com/baeldung/autovalue/ImmutableMoney.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autovalue/ImmutableMoney.java
rename to code-generation/src/main/java/com/baeldung/autovalue/ImmutableMoney.java
diff --git a/autovalue/src/main/java/com/baeldung/autovalue/MutableMoney.java b/code-generation/src/main/java/com/baeldung/autovalue/MutableMoney.java
similarity index 100%
rename from autovalue/src/main/java/com/baeldung/autovalue/MutableMoney.java
rename to code-generation/src/main/java/com/baeldung/autovalue/MutableMoney.java
diff --git a/autovalue/src/main/resources/logback.xml b/code-generation/src/main/resources/logback.xml
similarity index 100%
rename from autovalue/src/main/resources/logback.xml
rename to code-generation/src/main/resources/logback.xml
diff --git a/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java b/code-generation/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
similarity index 100%
rename from autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
rename to code-generation/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
diff --git a/autovalue/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java b/code-generation/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
similarity index 100%
rename from autovalue/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
rename to code-generation/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
diff --git a/pom.xml b/pom.xml
index 539f089e58..d15e7f22ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -366,7 +366,6 @@
 				<module>asciidoctor</module>
 				<module>asm</module>
 				<module>atomix</module>
-				<module>autovalue</module>
 				<module>aws</module>
 				<module>aws-lambda</module>
 				<module>axon</module>
@@ -381,6 +380,7 @@
 				<module>checker-plugin</module>
 				<module>cloud-foundry-uaa/cf-uaa-oauth2-client</module>
 				<module>cloud-foundry-uaa/cf-uaa-oauth2-resource-server</module>
+				<module>code-generation</module>
 				<module>core-groovy</module>
 				<module>core-groovy-2</module>
 				<module>core-groovy-collections</module>
@@ -1118,7 +1118,6 @@
 				<module>asciidoctor</module>
 				<module>asm</module>
 				<module>atomix</module>
-				<module>autovalue</module>
 				<module>aws</module>
 				<module>aws-lambda</module>
 				<module>axon</module>
@@ -1131,6 +1130,7 @@
 				<module>checker-plugin</module>
 				<module>cloud-foundry-uaa/cf-uaa-oauth2-client</module>
 				<module>cloud-foundry-uaa/cf-uaa-oauth2-resource-server</module>
+				<module>code-generation</module>
 				<module>core-groovy</module>
 				<module>core-groovy-2</module>
 				<module>core-groovy-collections</module>