diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index b58fdb810ff..a3fe5052336 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -58,7 +58,7 @@ public enum Config {
 	GuestVlanBits("Network", ManagementServer.class, Integer.class, "guest.vlan.bits", "12", "The number of bits to reserve for the VLAN identifier in the guest subnet.", null),
 	MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null),
 	NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed.", null),
-	GuestDomainSuffix("Network", AgentManager.class, String.class, "domain.suffix", "cloud-test.cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null),
+	GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud-test.cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null),
 	
 	//VPN
 	RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length", "24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null),
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index c98555fce02..c1f42920d81 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -846,7 +846,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             _instance = "DEFAULT";
         }
 
-        _networkDomain = configs.get("domain.suffix");
+        _networkDomain = configs.get("guest.domain.suffix");
 
         s_logger.info("Router configurations: " + "ramsize=" + _routerRamSize + "; templateId=" + _routerTemplateId);
 
diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java
index 0cd92c076f3..7b16b3ba612 100644
--- a/server/src/com/cloud/test/DatabaseConfig.java
+++ b/server/src/com/cloud/test/DatabaseConfig.java
@@ -165,7 +165,7 @@ public class DatabaseConfig {
         s_configurationDescriptions.put("port", "port to listen on for agent connection");
         //s_configurationDescriptions.put("guest.ip.network", "ip address for the router");
         //s_configurationDescriptions.put("guest.netmask", "default netmask for the guest network");
-        s_configurationDescriptions.put("domain.suffix", "domain suffix for users");
+        s_configurationDescriptions.put("guest.domain.suffix", "domain suffix for users");
         s_configurationDescriptions.put("instance.name", "Name of the deployment instance");
         s_configurationDescriptions.put("storage.overprovisioning.factor", "Storage Allocator overprovisioning factor");
         s_configurationDescriptions.put("retries.per.host", "The number of times each command sent to a host should be retried in case of failure.");
@@ -260,7 +260,7 @@ public class DatabaseConfig {
 		s_configurationComponents.put("ping.interval", "AgentManager");
 		s_configurationComponents.put("alert.wait", "AgentManager");
 		s_configurationComponents.put("update.wait", "AgentManager");
-		s_configurationComponents.put("domain.suffix", "AgentManager");
+		s_configurationComponents.put("guest.domain.suffix", "AgentManager");
 		s_configurationComponents.put("consoleproxy.ram.size", "AgentManager");
 		s_configurationComponents.put("consoleproxy.cmd.port", "AgentManager");
 		s_configurationComponents.put("consoleproxy.loadscan.interval", "AgentManager");
diff --git a/setup/db/server-setup.xml b/setup/db/server-setup.xml
index 71baa94d28e..7df7cb5ba2b 100755
--- a/setup/db/server-setup.xml
+++ b/setup/db/server-setup.xml
@@ -193,9 +193,9 @@
       <value>ZONE1</value>
     </configuration>
     <!--
-    The domain.suffix parameter...
+    The guest.domain.suffix parameter...
     -->    <configuration>
-      <name>domain.suffix</name>
+      <name>guest.domain.suffix</name>
       <value>qatest-vmops.com</value>
     </configuration>
     <!--