diff --git a/spring-boot-property-exp/pom.xml b/spring-boot-property-exp/pom.xml
index f554bb5b99..0c54d57db1 100644
--- a/spring-boot-property-exp/pom.xml
+++ b/spring-boot-property-exp/pom.xml
@@ -24,8 +24,8 @@
     </properties>
 
     <modules>
-        <module>property-exp-default</module>
-        <module>property-exp-custom</module>
+        <module>property-exp-default-config</module>
+        <module>property-exp-custom-config</module>
     </modules>
 
 
diff --git a/spring-boot-property-exp/property-exp-custom/pom.xml b/spring-boot-property-exp/property-exp-custom-config/pom.xml
similarity index 100%
rename from spring-boot-property-exp/property-exp-custom/pom.xml
rename to spring-boot-property-exp/property-exp-custom-config/pom.xml
diff --git a/spring-boot-property-exp/property-exp-custom/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java b/spring-boot-property-exp/property-exp-custom-config/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java
similarity index 100%
rename from spring-boot-property-exp/property-exp-custom/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java
rename to spring-boot-property-exp/property-exp-custom-config/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java
diff --git a/spring-boot-property-exp/property-exp-custom/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java b/spring-boot-property-exp/property-exp-custom-config/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java
similarity index 100%
rename from spring-boot-property-exp/property-exp-custom/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java
rename to spring-boot-property-exp/property-exp-custom-config/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java
diff --git a/spring-boot-property-exp/property-exp-custom/src/main/resources/application.properties b/spring-boot-property-exp/property-exp-custom-config/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-property-exp/property-exp-custom/src/main/resources/application.properties
rename to spring-boot-property-exp/property-exp-custom-config/src/main/resources/application.properties
diff --git a/spring-boot-property-exp/property-exp-custom/src/main/resources/banner.txt b/spring-boot-property-exp/property-exp-custom-config/src/main/resources/banner.txt
similarity index 100%
rename from spring-boot-property-exp/property-exp-custom/src/main/resources/banner.txt
rename to spring-boot-property-exp/property-exp-custom-config/src/main/resources/banner.txt
diff --git a/spring-boot-property-exp/property-exp-default/build.gradle b/spring-boot-property-exp/property-exp-default-config/build.gradle
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/build.gradle
rename to spring-boot-property-exp/property-exp-default-config/build.gradle
diff --git a/spring-boot-property-exp/property-exp-default/gradle.properties b/spring-boot-property-exp/property-exp-default-config/gradle.properties
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/gradle.properties
rename to spring-boot-property-exp/property-exp-default-config/gradle.properties
diff --git a/spring-boot-property-exp/property-exp-default/pom.xml b/spring-boot-property-exp/property-exp-default-config/pom.xml
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/pom.xml
rename to spring-boot-property-exp/property-exp-default-config/pom.xml
diff --git a/spring-boot-property-exp/property-exp-default/settings.gradle b/spring-boot-property-exp/property-exp-default-config/settings.gradle
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/settings.gradle
rename to spring-boot-property-exp/property-exp-default-config/settings.gradle
diff --git a/spring-boot-property-exp/property-exp-default/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java b/spring-boot-property-exp/property-exp-default-config/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java
rename to spring-boot-property-exp/property-exp-default-config/src/main/java/com/baeldung/propertyexpansion/SpringBootPropertyExpansionApp.java
diff --git a/spring-boot-property-exp/property-exp-default/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java b/spring-boot-property-exp/property-exp-default-config/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java
rename to spring-boot-property-exp/property-exp-default-config/src/main/java/com/baeldung/propertyexpansion/components/PropertyLoggerBean.java
diff --git a/spring-boot-property-exp/property-exp-default/src/main/resources/application.properties b/spring-boot-property-exp/property-exp-default-config/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/src/main/resources/application.properties
rename to spring-boot-property-exp/property-exp-default-config/src/main/resources/application.properties
diff --git a/spring-boot-property-exp/property-exp-default/src/main/resources/banner.txt b/spring-boot-property-exp/property-exp-default-config/src/main/resources/banner.txt
similarity index 100%
rename from spring-boot-property-exp/property-exp-default/src/main/resources/banner.txt
rename to spring-boot-property-exp/property-exp-default-config/src/main/resources/banner.txt