diff --git a/benchmarks/benchmarks.properties b/benchmarks/benchmarks.properties
index 87cba39a5f6e4f..be198aaaf5464e 100644
--- a/benchmarks/benchmarks.properties
+++ b/benchmarks/benchmarks.properties
@@ -207,7 +207,6 @@
     sample.sql.script=com/liferay/portal/tools/samplesqlbuilder/dependencies/sample.ftl
 
     #
-    # Specify virtual host name.
+    # Specify the virtual host name.
     #
-
-    sample.sql.virtual.host.name=localhost
+    sample.sql.virtual.hostname=localhost
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java
index 1741a8996db8d6..c375ea4adeb4e2 100644
--- a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java
+++ b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java
@@ -273,7 +273,7 @@ public DataFactory(Properties properties) throws Exception {
 		initUserNames();
 		initUserModels();
 		initVirtualHostModel(
-			properties.getProperty("sample.sql.virtual.host.name"));
+			properties.getProperty("sample.sql.virtual.hostname"));
 	}
 
 	public AccountModel getAccountModel() {
@@ -988,12 +988,12 @@ public void initUserNames() throws IOException {
 		unsyncBufferedReader.close();
 	}
 
-	public void initVirtualHostModel(String hostName) {
+	public void initVirtualHostModel(String hostname) {
 		_virtualHostModel = new VirtualHostModelImpl();
 
 		_virtualHostModel.setVirtualHostId(_counter.get());
 		_virtualHostModel.setCompanyId(_companyId);
-		_virtualHostModel.setHostname(hostName);
+		_virtualHostModel.setHostname(hostname);
 	}
 
 	public AssetEntryModel newAssetEntryModel(BlogsEntryModel blogsEntryModel) {
diff --git a/sql/build-parent.xml b/sql/build-parent.xml
index 354175c672f613..7fd7fe52aaa19d 100644
--- a/sql/build-parent.xml
+++ b/sql/build-parent.xml
@@ -215,7 +215,7 @@
 			<entry key="sample.sql.output.dir" value="${tstamp.value}" />
 			<entry key="sample.sql.output.merge" value="true" />
 			<entry key="sample.sql.script" value="com/liferay/portal/tools/samplesqlbuilder/dependencies/sample.ftl" />
-			<entry key="sample.sql.virtual.host.name" value="localhost" />
+			<entry key="sample.sql.virtual.hostname" value="localhost" />
 		</propertyfile>
 
 		<java