diff --git a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
index e4ea521d..e0c55791 100644
--- a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
+++ b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadata.groovy
@@ -52,7 +52,7 @@ class InitializrMetadata {
 
 	final TextCapability version = new TextCapability('version', 'Version', 'project version')
 
-	final TextCapability packageName = new PackageCapability(name)
+	final TextCapability packageName = new PackageCapability(groupId)
 
 	InitializrMetadata() {
 		this(new InitializrConfiguration())
diff --git a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadataBuilder.groovy b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadataBuilder.groovy
index 3045d948..87aa0b6e 100644
--- a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadataBuilder.groovy
+++ b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrMetadataBuilder.groovy
@@ -129,7 +129,7 @@ class InitializrMetadataBuilder {
 			metadata.description.content = 'Demo project for Spring Boot'
 		}
 		if (!metadata.groupId.content) {
-			metadata.groupId.content = 'org.test'
+			metadata.groupId.content = 'com.example'
 		}
 		if (!metadata.version.content) {
 			metadata.version.content = '0.0.1-SNAPSHOT'
diff --git a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrProperties.groovy b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrProperties.groovy
index f9b9df30..d9bfdc8f 100644
--- a/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrProperties.groovy
+++ b/initializr/src/main/groovy/io/spring/initializr/metadata/InitializrProperties.groovy
@@ -48,7 +48,7 @@ class InitializrProperties extends InitializrConfiguration {
 	final List<DefaultMetadataElement> bootVersions = []
 
 	@JsonIgnore
-	final SimpleElement groupId = new SimpleElement(value: 'org.test')
+	final SimpleElement groupId = new SimpleElement(value: 'com.example')
 
 	@JsonIgnore
 	final SimpleElement artifactId = new SimpleElement()
diff --git a/initializr/src/test/groovy/io/spring/initializr/test/ProjectAssert.groovy b/initializr/src/test/groovy/io/spring/initializr/test/ProjectAssert.groovy
index 660ac6a7..ba22c85f 100644
--- a/initializr/src/test/groovy/io/spring/initializr/test/ProjectAssert.groovy
+++ b/initializr/src/test/groovy/io/spring/initializr/test/ProjectAssert.groovy
@@ -96,8 +96,8 @@ class ProjectAssert {
 	}
 
 	ProjectAssert isJavaProject(String expectedApplicationName) {
-		hasFile("src/main/java/demo/${expectedApplicationName}.java",
-				"src/test/java/demo/${expectedApplicationName}Tests.java",
+		hasFile("src/main/java/com/example/${expectedApplicationName}.java",
+				"src/test/java/com/example/${expectedApplicationName}Tests.java",
 				'src/main/resources/application.properties')
 	}
 
@@ -107,8 +107,8 @@ class ProjectAssert {
 
 	ProjectAssert isGroovyProject(String expectedApplicationName) {
 		String codeLocation = (mavenProject ? 'java' : 'groovy')
-		hasFile("src/main/$codeLocation/demo/${expectedApplicationName}.groovy",
-				"src/test/$codeLocation/demo/${expectedApplicationName}Tests.groovy",
+		hasFile("src/main/$codeLocation/com/example/${expectedApplicationName}.groovy",
+				"src/test/$codeLocation/com/example/${expectedApplicationName}Tests.groovy",
 				'src/main/resources/application.properties')
 	}
 
@@ -118,7 +118,7 @@ class ProjectAssert {
 
 	ProjectAssert isJavaWarProject(String expectedApplicationName) {
 		isJavaProject(expectedApplicationName).hasStaticAndTemplatesResources(true)
-				.hasFile('src/main/java/demo/ServletInitializer.java')
+				.hasFile('src/main/java/com/example/ServletInitializer.java')
 	}
 
 	ProjectAssert isJavaWarProject() {
diff --git a/initializr/src/test/resources/metadata/config/test-default.json b/initializr/src/test/resources/metadata/config/test-default.json
index b1cb2216..3c0630b0 100644
--- a/initializr/src/test/resources/metadata/config/test-default.json
+++ b/initializr/src/test/resources/metadata/config/test-default.json
@@ -173,7 +173,7 @@
     "type": "TEXT"
   },
   "groupId": {
-    "content": "org.test",
+    "content": "com.example",
     "description": "project coordinates",
     "id": "groupId",
     "title": "Group",
@@ -228,7 +228,7 @@
     "type": "TEXT"
   },
   "packageName": {
-    "content": "demo",
+    "content": "com.example",
     "description": "root package",
     "id": "packageName",
     "title": "Package Name",
diff --git a/initializr/src/test/resources/metadata/test-default-2.0.0.json b/initializr/src/test/resources/metadata/test-default-2.0.0.json
index 5dc28d3f..dcf35f70 100644
--- a/initializr/src/test/resources/metadata/test-default-2.0.0.json
+++ b/initializr/src/test/resources/metadata/test-default-2.0.0.json
@@ -165,7 +165,7 @@
   },
   "groupId": {
     "type": "text",
-    "default": "org.test"
+    "default": "com.example"
   },
   "artifactId": {
     "type": "text",
@@ -185,6 +185,6 @@
   },
   "packageName": {
     "type": "text",
-    "default": "demo"
+    "default": "com.example"
   }
 }
\ No newline at end of file
diff --git a/initializr/src/test/resources/metadata/test-default-2.1.0.json b/initializr/src/test/resources/metadata/test-default-2.1.0.json
index b6d2ca76..34f1469c 100644
--- a/initializr/src/test/resources/metadata/test-default-2.1.0.json
+++ b/initializr/src/test/resources/metadata/test-default-2.1.0.json
@@ -175,7 +175,7 @@
   },
   "groupId": {
     "type": "text",
-    "default": "org.test"
+    "default": "com.example"
   },
   "artifactId": {
     "type": "text",
@@ -195,6 +195,6 @@
   },
   "packageName": {
     "type": "text",
-    "default": "demo"
+    "default": "com.example"
   }
 }
\ No newline at end of file