diff --git a/api/src/com/cloud/network/VirtualRouterProvider.java b/api/src/com/cloud/network/VirtualRouterProvider.java
index 8574aef23c4..1eea3f236e3 100644
--- a/api/src/com/cloud/network/VirtualRouterProvider.java
+++ b/api/src/com/cloud/network/VirtualRouterProvider.java
@@ -20,8 +20,8 @@ package com.cloud.network;
 
 public interface VirtualRouterProvider {
     public enum VirtualRouterProviderType {
-        VirtualRouterElement,
-        RedundantVirtualRouterElement,
+        VirtualRouter,
+        RedundantVirtualRouter,
         ElasticLoadBalancerVm
     }
     public VirtualRouterProviderType getType();
diff --git a/server/src/com/cloud/network/element/RedundantVirtualRouterElement.java b/server/src/com/cloud/network/element/RedundantVirtualRouterElement.java
index d168c874158..4fd6c3575df 100644
--- a/server/src/com/cloud/network/element/RedundantVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/RedundantVirtualRouterElement.java
@@ -92,7 +92,7 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
     
     @Override
     public boolean configure(ConfigureRedundantVirtualRouterElementCmd cmd) {
-        VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.RedundantVirtualRouterElement);
+        VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.RedundantVirtualRouter);
         if (element == null) {
             s_logger.trace("Can't find element with UUID " + cmd.getNspId());
             return false;
@@ -105,19 +105,19 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
     
     @Override
     public VirtualRouterProvider addElement(Long nspId) {
-        VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouterElement);
+        VirtualRouterProviderVO element = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouter);
         if (element != null) {
             s_logger.trace("There is already a redundant virtual router element with service provider id " + nspId);
             return null;
         }
-        element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.RedundantVirtualRouterElement);
+        element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.RedundantVirtualRouter);
         _vrElementsDao.persist(element);
         return element;
     }
     
     @Override
     public boolean isReady(PhysicalNetworkServiceProvider provider) {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouterElement);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouter);
         if (element == null) {
             return false;
         }
@@ -126,14 +126,14 @@ public class RedundantVirtualRouterElement extends VirtualRouterElement implemen
 
     @Override
     public Long getIdByNspId(Long nspId) {
-        VirtualRouterProviderVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouterElement);
+        VirtualRouterProviderVO vr = _vrElementsDao.findByNspIdAndType(nspId, VirtualRouterProviderType.RedundantVirtualRouter);
         return vr.getId();
     }
     
     @Override
     public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException,
             ResourceUnavailableException {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouterElement);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.RedundantVirtualRouter);
         if (element == null) {
             return true;
         }
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index b12faef4cab..51c02ca3566 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -382,7 +382,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     
     @Override
     public boolean configure(ConfigureVirtualRouterElementCmd cmd) {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.VirtualRouterElement);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(cmd.getNspId(), VirtualRouterProviderType.VirtualRouter);
         if (element == null) {
             s_logger.trace("Can't find element with network service provider id " + cmd.getNspId());
             return false;
@@ -396,13 +396,12 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     
     @Override
     public VirtualRouterProvider addElement(Long nspId) {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouterElement);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouter);
         if (element != null) {
             s_logger.trace("There is already a virtual router element with service provider id " + nspId);
             return null;
         }
-        element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.VirtualRouterElement);
-        element.setEnabled(true);
+        element = new VirtualRouterProviderVO(nspId, null, VirtualRouterProviderType.VirtualRouter);
         _vrProviderDao.persist(element);
         return element;
     }
@@ -428,7 +427,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     
     @Override
     public boolean isReady(PhysicalNetworkServiceProvider provider) {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouterElement);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
         if (element == null) {
             return false;
         }
@@ -438,7 +437,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     @Override
     public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException,
             ResourceUnavailableException {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouterElement);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
         if (element == null) {
             return true;
         }
@@ -459,7 +458,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
 
     @Override
     public Long getIdByNspId(Long nspId) {
-        VirtualRouterProviderVO vr = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouterElement);
+        VirtualRouterProviderVO vr = _vrProviderDao.findByNspIdAndType(nspId, VirtualRouterProviderType.VirtualRouter);
         return vr.getId();
     }
 
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 305dba528e8..03416888ef1 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1148,21 +1148,19 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                 if (offering_id == null) {
                     offering_id = _offering.getId();
                 }
-                VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouterElement;
-                String typeString = "VirtualRouter";
+                VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouter;
                 if (isRedundant) {
-                    type = VirtualRouterProviderType.RedundantVirtualRouterElement;
-                    typeString = "RedundantVirtualRouter";
+                    type = VirtualRouterProviderType.RedundantVirtualRouter;
                 }
                 
                 Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
-                PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, typeString);
+                PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, type.toString());
                 if (provider == null) {
-                    throw new CloudRuntimeException("Cannot find service provider " + typeString + " in physical network " + physicalNetworkId);
+                    throw new CloudRuntimeException("Cannot find service provider " + type.toString() + " in physical network " + physicalNetworkId);
                 }
                 VirtualRouterProvider vrProvider = _vrProviderDao.findByNspIdAndType(provider.getId(), type);
                 if (vrProvider == null) {
-                    throw new CloudRuntimeException("Cannot find virtual router provider " + typeString + " as service provider " + provider.getId());
+                    throw new CloudRuntimeException("Cannot find virtual router provider " + type.toString()+ " as service provider " + provider.getId());
                 }
                 ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(offering_id);