diff --git a/server/src/com/cloud/network/rules/DhcpEntryRules.java b/server/src/com/cloud/network/rules/DhcpEntryRules.java
index b9c91e9bd7c..7e0eae02333 100644
--- a/server/src/com/cloud/network/rules/DhcpEntryRules.java
+++ b/server/src/com/cloud/network/rules/DhcpEntryRules.java
@@ -42,7 +42,7 @@ public class DhcpEntryRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
         return visitor.visit(this);
     }
diff --git a/server/src/com/cloud/network/rules/DhcpRules.java b/server/src/com/cloud/network/rules/DhcpRules.java
index c4c4f59df60..172c198ff85 100644
--- a/server/src/com/cloud/network/rules/DhcpRules.java
+++ b/server/src/com/cloud/network/rules/DhcpRules.java
@@ -42,7 +42,7 @@ public class DhcpRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
         return visitor.visit(this);
     }
diff --git a/server/src/com/cloud/network/rules/DhcpSubNetRules.java b/server/src/com/cloud/network/rules/DhcpSubNetRules.java
index d82685625c4..b3374bab97e 100644
--- a/server/src/com/cloud/network/rules/DhcpSubNetRules.java
+++ b/server/src/com/cloud/network/rules/DhcpSubNetRules.java
@@ -42,7 +42,7 @@ public class DhcpSubNetRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
         return visitor.visit(this);
     }
diff --git a/server/src/com/cloud/network/rules/FirewallRules.java b/server/src/com/cloud/network/rules/FirewallRules.java
index 231c8890531..33e3c98b96f 100644
--- a/server/src/com/cloud/network/rules/FirewallRules.java
+++ b/server/src/com/cloud/network/rules/FirewallRules.java
@@ -57,35 +57,35 @@ import com.cloud.vm.NicProfile;
 
 public class FirewallRules extends RuleApplier {
 
-    private final List<? extends FirewallRule> rules;
-    private List<LoadBalancingRule> loadbalancingRules;
+    private final List<? extends FirewallRule> _rules;
+    private List<LoadBalancingRule> _loadbalancingRules;
 
-    private Purpose purpose;
+    private Purpose _purpose;
 
     public FirewallRules(final Network network, final List<? extends FirewallRule> rules) {
         super(network);
-        this.rules = rules;
+        _rules = rules;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
 
-        purpose = rules.get(0).getPurpose();
+        _purpose = _rules.get(0).getPurpose();
 
-        if (purpose == Purpose.LoadBalancing) {
+        if (_purpose == Purpose.LoadBalancing) {
             // for load balancer we have to resend all lb rules for the network
-            final List<LoadBalancerVO> lbs = loadBalancerDao.listByNetworkIdAndScheme(network.getId(), Scheme.Public);
-            loadbalancingRules = new ArrayList<LoadBalancingRule>();
+            final List<LoadBalancerVO> lbs = _loadBalancerDao.listByNetworkIdAndScheme(_network.getId(), Scheme.Public);
+            _loadbalancingRules = new ArrayList<LoadBalancingRule>();
             for (final LoadBalancerVO lb : lbs) {
-                final List<LbDestination> dstList = lbMgr.getExistingDestinations(lb.getId());
-                final List<LbStickinessPolicy> policyList = lbMgr.getStickinessPolicies(lb.getId());
-                final List<LbHealthCheckPolicy> hcPolicyList = lbMgr.getHealthCheckPolicies(lb.getId());
-                final LbSslCert sslCert = lbMgr.getLbSslCert(lb.getId());
-                final Ip sourceIp = networkModel.getPublicIpAddress(lb.getSourceIpAddressId()).getAddress();
+                final List<LbDestination> dstList = _lbMgr.getExistingDestinations(lb.getId());
+                final List<LbStickinessPolicy> policyList = _lbMgr.getStickinessPolicies(lb.getId());
+                final List<LbHealthCheckPolicy> hcPolicyList = _lbMgr.getHealthCheckPolicies(lb.getId());
+                final LbSslCert sslCert = _lbMgr.getLbSslCert(lb.getId());
+                final Ip sourceIp = _networkModel.getPublicIpAddress(lb.getSourceIpAddressId()).getAddress();
                 final LoadBalancingRule loadBalancing = new LoadBalancingRule(lb, dstList, policyList, hcPolicyList, sourceIp, sslCert, lb.getLbProtocol());
 
-                loadbalancingRules.add(loadBalancing);
+                _loadbalancingRules.add(loadBalancing);
             }
         }
 
@@ -93,15 +93,15 @@ public class FirewallRules extends RuleApplier {
     }
 
     public List<? extends FirewallRule> getRules() {
-        return rules;
+        return _rules;
     }
 
     public List<LoadBalancingRule> getLoadbalancingRules() {
-        return loadbalancingRules;
+        return _loadbalancingRules;
     }
 
     public Purpose getPurpose() {
-        return purpose;
+        return _purpose;
     }
 
     public void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule> rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) {
@@ -126,36 +126,36 @@ public class FirewallRules extends RuleApplier {
         String routerPublicIp = null;
 
         if (router instanceof DomainRouterVO) {
-            final DomainRouterVO domr = routerDao.findById(router.getId());
+            final DomainRouterVO domr = _routerDao.findById(router.getId());
             routerPublicIp = domr.getPublicIpAddress();
         }
 
-        final Network guestNetwork = networkModel.getNetwork(guestNetworkId);
-        final Nic nic = nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), router.getId());
+        final Network guestNetwork = _networkModel.getNetwork(guestNetworkId);
+        final Nic nic = _nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), router.getId());
         final NicProfile nicProfile =
-                new NicProfile(nic, guestNetwork, nic.getBroadcastUri(), nic.getIsolationUri(), networkModel.getNetworkRate(guestNetwork.getId(), router.getId()),
-                        networkModel.isSecurityGroupSupportedInNetwork(guestNetwork), networkModel.getNetworkTag(router.getHypervisorType(), guestNetwork));
-        final NetworkOffering offering = networkOfferingDao.findById(guestNetwork.getNetworkOfferingId());
+                new NicProfile(nic, guestNetwork, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(guestNetwork.getId(), router.getId()),
+                        _networkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _networkModel.getNetworkTag(router.getHypervisorType(), guestNetwork));
+        final NetworkOffering offering = _networkOfferingDao.findById(guestNetwork.getNetworkOfferingId());
         String maxconn = null;
         if (offering.getConcurrentConnections() == null) {
-            maxconn = configDao.getValue(Config.NetworkLBHaproxyMaxConn.key());
+            maxconn = _configDao.getValue(Config.NetworkLBHaproxyMaxConn.key());
         } else {
             maxconn = offering.getConcurrentConnections().toString();
         }
 
         final LoadBalancerConfigCommand cmd =
-                new LoadBalancerConfigCommand(lbs, routerPublicIp, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()), router.getPrivateIpAddress(), itMgr.toNicTO(
+                new LoadBalancerConfigCommand(lbs, routerPublicIp, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()), router.getPrivateIpAddress(), _itMgr.toNicTO(
                         nicProfile, router.getHypervisorType()), router.getVpcId(), maxconn, offering.isKeepAliveEnabled());
 
-        cmd.lbStatsVisibility = configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
-        cmd.lbStatsUri = configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
-        cmd.lbStatsAuth = configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
-        cmd.lbStatsPort = configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
+        cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
+        cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
+        cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
+        cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
 
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
         cmds.addCommand(cmd);
 
@@ -165,7 +165,7 @@ public class FirewallRules extends RuleApplier {
         List<PortForwardingRuleTO> rulesTO = new ArrayList<PortForwardingRuleTO>();
         if (rules != null) {
             for (final PortForwardingRule rule : rules) {
-                final IpAddress sourceIp = networkModel.getIp(rule.getSourceIpAddressId());
+                final IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId());
                 final PortForwardingRuleTO ruleTO = new PortForwardingRuleTO(rule, null, sourceIp.getAddress().addr());
                 rulesTO.add(ruleTO);
             }
@@ -179,10 +179,10 @@ public class FirewallRules extends RuleApplier {
             cmd = new SetPortForwardingRulesCommand(rulesTO);
         }
 
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
 
         cmds.addCommand(cmd);
@@ -192,17 +192,17 @@ public class FirewallRules extends RuleApplier {
         List<StaticNatRuleTO> rulesTO = new ArrayList<StaticNatRuleTO>();
         if (rules != null) {
             for (final StaticNatRule rule : rules) {
-                final IpAddress sourceIp = networkModel.getIp(rule.getSourceIpAddressId());
+                final IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId());
                 final StaticNatRuleTO ruleTO = new StaticNatRuleTO(rule, null, sourceIp.getAddress().addr(), rule.getDestIpAddress());
                 rulesTO.add(ruleTO);
             }
         }
 
         final SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO, router.getVpcId());
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
         cmds.addCommand(cmd);
     }
@@ -218,15 +218,15 @@ public class FirewallRules extends RuleApplier {
                 }
             }
             for (final FirewallRule rule : rules) {
-                rulesDao.loadSourceCidrs((FirewallRuleVO)rule);
+                _rulesDao.loadSourceCidrs((FirewallRuleVO)rule);
                 final FirewallRule.TrafficType traffictype = rule.getTrafficType();
                 if (traffictype == FirewallRule.TrafficType.Ingress) {
-                    final IpAddress sourceIp = networkModel.getIp(rule.getSourceIpAddressId());
+                    final IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId());
                     final FirewallRuleTO ruleTO = new FirewallRuleTO(rule, null, sourceIp.getAddress().addr(), Purpose.Firewall, traffictype);
                     rulesTO.add(ruleTO);
                 } else if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) {
-                    final NetworkVO network = networkDao.findById(guestNetworkId);
-                    final NetworkOfferingVO offering = networkOfferingDao.findById(network.getNetworkOfferingId());
+                    final NetworkVO network = _networkDao.findById(guestNetworkId);
+                    final NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
                     defaultEgressPolicy = offering.getEgressDefaultPolicy();
                     assert (rule.getSourceIpAddressId() == null) : "ipAddressId should be null for egress firewall rule. ";
                     final FirewallRuleTO ruleTO = new FirewallRuleTO(rule, null, "", Purpose.Firewall, traffictype, defaultEgressPolicy);
@@ -236,10 +236,10 @@ public class FirewallRules extends RuleApplier {
         }
 
         final SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rulesTO);
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
         if (systemRule != null) {
             cmd.setAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT, systemRule);
diff --git a/server/src/com/cloud/network/rules/IpAssociationRules.java b/server/src/com/cloud/network/rules/IpAssociationRules.java
index 03a74a1a7aa..60becd20332 100644
--- a/server/src/com/cloud/network/rules/IpAssociationRules.java
+++ b/server/src/com/cloud/network/rules/IpAssociationRules.java
@@ -43,22 +43,22 @@ import com.cloud.vm.NicVO;
 
 public class IpAssociationRules extends RuleApplier {
 
-    private final List<? extends PublicIpAddress> ipAddresses;
+    private final List<? extends PublicIpAddress> _ipAddresses;
 
     public IpAssociationRules(final Network network, final List<? extends PublicIpAddress> ipAddresses) {
         super(network);
-        this.ipAddresses = ipAddresses;
+        _ipAddresses = ipAddresses;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
 
         return visitor.visit(this);
     }
 
     public List<? extends PublicIpAddress> getIpAddresses() {
-        return ipAddresses;
+        return _ipAddresses;
     }
 
     public void createAssociateIPCommands(final VirtualRouter router, final List<? extends PublicIpAddress> ips, final Commands cmds, final long vmId) {
@@ -79,10 +79,10 @@ public class IpAssociationRules extends RuleApplier {
             vlanIpMap.put(vlanTag, ipList);
         }
 
-        final List<NicVO> nics = nicDao.listByVmId(router.getId());
+        final List<NicVO> nics = _nicDao.listByVmId(router.getId());
         String baseMac = null;
         for (final NicVO nic : nics) {
-            final NetworkVO nw = networkDao.findById(nic.getNetworkId());
+            final NetworkVO nw = _networkDao.findById(nic.getNetworkId());
             if (nw.getTrafficType() == TrafficType.Public) {
                 baseMac = nic.getMacAddress();
                 break;
@@ -102,8 +102,8 @@ public class IpAssociationRules extends RuleApplier {
             });
 
             // Get network rate - required for IpAssoc
-            final Integer networkRate = networkModel.getNetworkRate(ipAddrList.get(0).getNetworkId(), router.getId());
-            final Network network = networkModel.getNetwork(ipAddrList.get(0).getNetworkId());
+            final Integer networkRate = _networkModel.getNetworkRate(ipAddrList.get(0).getNetworkId(), router.getId());
+            final Network network = _networkModel.getNetwork(ipAddrList.get(0).getNetworkId());
 
             final IpAddressTO[] ipsToSend = new IpAddressTO[ipAddrList.size()];
             int i = 0;
@@ -134,7 +134,7 @@ public class IpAssociationRules extends RuleApplier {
                                 networkRate, ipAddr.isOneToOneNat());
 
                 ip.setTrafficType(network.getTrafficType());
-                ip.setNetworkName(networkModel.getNetworkTag(router.getHypervisorType(), network));
+                ip.setNetworkName(_networkModel.getNetworkTag(router.getHypervisorType(), network));
                 ipsToSend[i++] = ip;
                 /* send the firstIP = true for the first Add, this is to create primary on interface*/
                 if (!firstIP || add) {
@@ -142,10 +142,10 @@ public class IpAssociationRules extends RuleApplier {
                 }
             }
             final IpAssocCommand cmd = new IpAssocCommand(ipsToSend);
-            cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-            cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(ipAddrList.get(0).getAssociatedWithNetworkId(), router.getId()));
+            cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+            cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(ipAddrList.get(0).getAssociatedWithNetworkId(), router.getId()));
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-            final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+            final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
             cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
 
             cmds.addCommand("IPAssocCommand", cmd);
diff --git a/server/src/com/cloud/network/rules/LoadBalancingRules.java b/server/src/com/cloud/network/rules/LoadBalancingRules.java
index 7d1ed1f23e6..ff760ab5cc3 100644
--- a/server/src/com/cloud/network/rules/LoadBalancingRules.java
+++ b/server/src/com/cloud/network/rules/LoadBalancingRules.java
@@ -45,39 +45,39 @@ import com.cloud.vm.NicProfile;
 
 public class LoadBalancingRules extends RuleApplier {
 
-    private final List<LoadBalancingRule> rules;
+    private final List<LoadBalancingRule> _rules;
 
     public LoadBalancingRules(final Network network, final List<LoadBalancingRule> rules) {
         super(network);
-        this.rules = rules;
+        _rules = rules;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
 
         // For load balancer we have to resend all lb rules for the network
-        final List<LoadBalancerVO> lbs = loadBalancerDao.listByNetworkIdAndScheme(network.getId(), Scheme.Public);
+        final List<LoadBalancerVO> lbs = _loadBalancerDao.listByNetworkIdAndScheme(_network.getId(), Scheme.Public);
 
         // We are cleaning it before because all the rules have to be sent to
         // the router.
-        rules.clear();
+        _rules.clear();
         for (final LoadBalancerVO lb : lbs) {
-            final List<LbDestination> dstList = lbMgr.getExistingDestinations(lb.getId());
-            final List<LbStickinessPolicy> policyList = lbMgr.getStickinessPolicies(lb.getId());
-            final List<LbHealthCheckPolicy> hcPolicyList = lbMgr.getHealthCheckPolicies(lb.getId());
-            final LbSslCert sslCert = lbMgr.getLbSslCert(lb.getId());
-            final Ip sourceIp = networkModel.getPublicIpAddress(lb.getSourceIpAddressId()).getAddress();
+            final List<LbDestination> dstList = _lbMgr.getExistingDestinations(lb.getId());
+            final List<LbStickinessPolicy> policyList = _lbMgr.getStickinessPolicies(lb.getId());
+            final List<LbHealthCheckPolicy> hcPolicyList = _lbMgr.getHealthCheckPolicies(lb.getId());
+            final LbSslCert sslCert = _lbMgr.getLbSslCert(lb.getId());
+            final Ip sourceIp = _networkModel.getPublicIpAddress(lb.getSourceIpAddressId()).getAddress();
             final LoadBalancingRule loadBalancing = new LoadBalancingRule(lb, dstList, policyList, hcPolicyList, sourceIp, sslCert, lb.getLbProtocol());
 
-            rules.add(loadBalancing);
+            _rules.add(loadBalancing);
         }
 
         return visitor.visit(this);
     }
 
     public List<LoadBalancingRule> getRules() {
-        return rules;
+        return _rules;
     }
 
     public void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule> rules, final VirtualRouter router, final Commands cmds, final long guestNetworkId) {
@@ -101,34 +101,34 @@ public class LoadBalancingRules extends RuleApplier {
         String routerPublicIp = null;
 
         if (router instanceof DomainRouterVO) {
-            final DomainRouterVO domr = routerDao.findById(router.getId());
+            final DomainRouterVO domr = _routerDao.findById(router.getId());
             routerPublicIp = domr.getPublicIpAddress();
         }
 
-        final Network guestNetwork = networkModel.getNetwork(guestNetworkId);
-        final Nic nic = nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), router.getId());
-        final NicProfile nicProfile = new NicProfile(nic, guestNetwork, nic.getBroadcastUri(), nic.getIsolationUri(), networkModel.getNetworkRate(guestNetwork.getId(),
-                router.getId()), networkModel.isSecurityGroupSupportedInNetwork(guestNetwork), networkModel.getNetworkTag(router.getHypervisorType(), guestNetwork));
-        final NetworkOffering offering = networkOfferingDao.findById(guestNetwork.getNetworkOfferingId());
+        final Network guestNetwork = _networkModel.getNetwork(guestNetworkId);
+        final Nic nic = _nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), router.getId());
+        final NicProfile nicProfile = new NicProfile(nic, guestNetwork, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(guestNetwork.getId(),
+                router.getId()), _networkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _networkModel.getNetworkTag(router.getHypervisorType(), guestNetwork));
+        final NetworkOffering offering = _networkOfferingDao.findById(guestNetwork.getNetworkOfferingId());
         String maxconn = null;
         if (offering.getConcurrentConnections() == null) {
-            maxconn = configDao.getValue(Config.NetworkLBHaproxyMaxConn.key());
+            maxconn = _configDao.getValue(Config.NetworkLBHaproxyMaxConn.key());
         } else {
             maxconn = offering.getConcurrentConnections().toString();
         }
 
-        final LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, routerPublicIp, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()),
-                router.getPrivateIpAddress(), itMgr.toNicTO(nicProfile, router.getHypervisorType()), router.getVpcId(), maxconn, offering.isKeepAliveEnabled());
+        final LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, routerPublicIp, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()),
+                router.getPrivateIpAddress(), _itMgr.toNicTO(nicProfile, router.getHypervisorType()), router.getVpcId(), maxconn, offering.isKeepAliveEnabled());
 
-        cmd.lbStatsVisibility = configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
-        cmd.lbStatsUri = configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
-        cmd.lbStatsAuth = configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
-        cmd.lbStatsPort = configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
+        cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
+        cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
+        cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
+        cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
 
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
         cmds.addCommand(cmd);
     }
diff --git a/server/src/com/cloud/network/rules/NetworkAclsRules.java b/server/src/com/cloud/network/rules/NetworkAclsRules.java
index 670da9d9dee..3680fc066e0 100644
--- a/server/src/com/cloud/network/rules/NetworkAclsRules.java
+++ b/server/src/com/cloud/network/rules/NetworkAclsRules.java
@@ -37,7 +37,7 @@ public class NetworkAclsRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
         return visitor.visit(this);
     }
diff --git a/server/src/com/cloud/network/rules/PasswordToRouterRules.java b/server/src/com/cloud/network/rules/PasswordToRouterRules.java
index 379601bf034..e6a27b728d2 100644
--- a/server/src/com/cloud/network/rules/PasswordToRouterRules.java
+++ b/server/src/com/cloud/network/rules/PasswordToRouterRules.java
@@ -48,26 +48,26 @@ public class PasswordToRouterRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
-        userVmDao.loadDetails((UserVmVO)profile.getVirtualMachine());
+        _userVmDao.loadDetails((UserVmVO)profile.getVirtualMachine());
         // for basic zone, send vm data/password information only to the router in the same pod
-        nicVo = nicDao.findById(nic.getId());
+        nicVo = _nicDao.findById(nic.getId());
 
         return visitor.visit(this);
     }
 
     public void createPasswordCommand(final VirtualRouter router, final VirtualMachineProfile profile, final NicVO nic, final Commands cmds) {
         final String password = (String)profile.getParameter(VirtualMachineProfile.Param.VmPassword);
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
 
         // password should be set only on default network element
         if (password != null && nic.isDefaultNic()) {
             final String encodedPassword = PasswordGenerator.rot13(password);
             final SavePasswordCommand cmd =
-                    new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), networkModel.getExecuteInSeqNtwkElmtCmd());
-            cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-            cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
+                    new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), _networkModel.getExecuteInSeqNtwkElmtCmd());
+            cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+            cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
             cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
 
diff --git a/server/src/com/cloud/network/rules/PrivateGatewayRules.java b/server/src/com/cloud/network/rules/PrivateGatewayRules.java
index 06554886dd4..364aded3128 100644
--- a/server/src/com/cloud/network/rules/PrivateGatewayRules.java
+++ b/server/src/com/cloud/network/rules/PrivateGatewayRules.java
@@ -37,7 +37,7 @@ public class PrivateGatewayRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
         return visitor.visit(this);
     }
diff --git a/server/src/com/cloud/network/rules/RuleApplier.java b/server/src/com/cloud/network/rules/RuleApplier.java
index 55baa14644c..e101a5bc5bc 100644
--- a/server/src/com/cloud/network/rules/RuleApplier.java
+++ b/server/src/com/cloud/network/rules/RuleApplier.java
@@ -49,63 +49,63 @@ import com.cloud.vm.dao.UserVmDao;
 
 public abstract class RuleApplier {
 
-    protected NEWVirtualNetworkApplianceManager applianceManager;
+    protected NEWVirtualNetworkApplianceManager _applianceManager;
 
-    protected NetworkModel networkModel;
+    protected NetworkModel _networkModel;
 
-    protected LoadBalancingRulesManager lbMgr;
+    protected LoadBalancingRulesManager _lbMgr;
 
-    protected LoadBalancerDao loadBalancerDao;
+    protected LoadBalancerDao _loadBalancerDao;
 
-    protected ConfigurationDao configDao;
+    protected ConfigurationDao _configDao;
 
-    protected NicDao nicDao;
+    protected NicDao _nicDao;
 
-    protected NetworkOfferingDao networkOfferingDao;
+    protected NetworkOfferingDao _networkOfferingDao;
 
-    protected DataCenterDao dcDao;
+    protected DataCenterDao _dcDao;
 
-    protected DomainRouterDao routerDao;
+    protected DomainRouterDao _routerDao;
 
-    protected UserVmDao userVmDao;
+    protected UserVmDao _userVmDao;
 
-    protected ServiceOfferingDao serviceOfferingDao;
+    protected ServiceOfferingDao _serviceOfferingDao;
 
-    protected VMTemplateDao templateDao;
+    protected VMTemplateDao _templateDao;
 
-    protected NetworkDao networkDao;
+    protected NetworkDao _networkDao;
 
-    protected FirewallRulesDao rulesDao;
+    protected FirewallRulesDao _rulesDao;
 
-    protected VirtualMachineManager itMgr;
+    protected VirtualMachineManager _itMgr;
 
-    protected Network network;
+    protected Network _network;
 
-    protected VirtualRouter router;
+    protected VirtualRouter _router;
 
-    protected RouterControlHelper routerControlHelper;
+    protected RouterControlHelper _routerControlHelper;
 
     public RuleApplier(final Network network) {
-        this.network = network;
+        this._network = network;
     }
 
     public abstract boolean accept(NetworkTopologyVisitor visitor, VirtualRouter router) throws ResourceUnavailableException;
 
     public Network getNetwork() {
-        return network;
+        return _network;
     }
 
     public VirtualRouter getRouter() {
-        return router;
+        return _router;
     }
 
     public NEWVirtualNetworkApplianceManager getApplianceManager() {
-        return applianceManager;
+        return _applianceManager;
     }
 
     public void createVmDataCommand(final VirtualRouter router, final UserVm vm, final NicVO nic, final String publicKey, final Commands cmds) {
-        final String serviceOffering = serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()).getDisplayText();
-        final String zoneName = dcDao.findById(router.getDataCenterId()).getName();
+        final String serviceOffering = _serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()).getDisplayText();
+        final String zoneName = _dcDao.findById(router.getDataCenterId()).getName();
         cmds.addCommand(
                 "vmdata",
                 generateVmDataCommand(router, nic.getIp4Address(), vm.getUserData(), serviceOffering, zoneName, nic.getIp4Address(), vm.getHostName(), vm.getInstanceName(),
@@ -114,13 +114,13 @@ public abstract class RuleApplier {
 
     public VmDataCommand generateVmDataCommand(final VirtualRouter router, final String vmPrivateIpAddress, final String userData, final String serviceOffering, final String zoneName,
             final String guestIpAddress, final String vmName, final String vmInstanceName, final long vmId, final String vmUuid, final String publicKey, final long guestNetworkId) {
-        final VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName, networkModel.getExecuteInSeqNtwkElmtCmd());
+        final VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName, _networkModel.getExecuteInSeqNtwkElmtCmd());
 
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
 
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
 
         cmd.addVmData("userdata", "user-data", userData);
@@ -146,7 +146,7 @@ public abstract class RuleApplier {
         }
         cmd.addVmData("metadata", "public-keys", publicKey);
 
-        String cloudIdentifier = configDao.getValue("cloud.identifier");
+        String cloudIdentifier = _configDao.getValue("cloud.identifier");
         if (cloudIdentifier == null) {
             cloudIdentifier = "";
         } else {
diff --git a/server/src/com/cloud/network/rules/RuleApplierWrapper.java b/server/src/com/cloud/network/rules/RuleApplierWrapper.java
index 23a5743d75c..f13c97caf23 100644
--- a/server/src/com/cloud/network/rules/RuleApplierWrapper.java
+++ b/server/src/com/cloud/network/rules/RuleApplierWrapper.java
@@ -20,13 +20,13 @@ package com.cloud.network.rules;
 
 public class RuleApplierWrapper<T> {
 
-    private final T ruleType;
+    private final T _ruleType;
 
     public RuleApplierWrapper(final T ruleApplier) {
-        this.ruleType = ruleApplier;
+        this._ruleType = ruleApplier;
     }
 
     public T getRuleType() {
-        return ruleType;
+        return _ruleType;
     }
 }
\ No newline at end of file
diff --git a/server/src/com/cloud/network/rules/SshKeyToRouterRules.java b/server/src/com/cloud/network/rules/SshKeyToRouterRules.java
index 73d0e004ae2..14acabaf315 100644
--- a/server/src/com/cloud/network/rules/SshKeyToRouterRules.java
+++ b/server/src/com/cloud/network/rules/SshKeyToRouterRules.java
@@ -35,46 +35,46 @@ import com.cloud.vm.VirtualMachineProfile;
 
 public class SshKeyToRouterRules extends RuleApplier {
 
-    private final NicProfile nic;
-    private final VirtualMachineProfile profile;
-    private final String sshPublicKey;
+    private final NicProfile _nic;
+    private final VirtualMachineProfile _profile;
+    private final String _sshPublicKey;
 
-    private NicVO nicVo;
-    private VMTemplateVO template;
-    private UserVmVO userVM;
+    private NicVO _nicVo;
+    private VMTemplateVO _template;
+    private UserVmVO _userVM;
 
     public SshKeyToRouterRules(final Network network, final NicProfile nic, final VirtualMachineProfile profile, final String sshPublicKey) {
         super(network);
 
-        this.nic = nic;
-        this.profile = profile;
-        this.sshPublicKey = sshPublicKey;
+        _nic = nic;
+        _profile = profile;
+        _sshPublicKey = sshPublicKey;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
-        userVM = userVmDao.findById(profile.getVirtualMachine().getId());
-        userVmDao.loadDetails(userVM);
+        _router = router;
+        _userVM = _userVmDao.findById(_profile.getVirtualMachine().getId());
+        _userVmDao.loadDetails(_userVM);
 
-        nicVo = nicDao.findById(nic.getId());
+        _nicVo = _nicDao.findById(_nic.getId());
         // for basic zone, send vm data/password information only to the router in the same pod
-        template = templateDao.findByIdIncludingRemoved(profile.getTemplateId());
+        _template = _templateDao.findByIdIncludingRemoved(_profile.getTemplateId());
 
         return visitor.visit(this);
     }
 
     public void createPasswordCommand(final VirtualRouter router, final VirtualMachineProfile profile, final NicVO nic, final Commands cmds) {
         final String password = (String)profile.getParameter(VirtualMachineProfile.Param.VmPassword);
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
 
         // password should be set only on default network element
         if (password != null && nic.isDefaultNic()) {
             final String encodedPassword = PasswordGenerator.rot13(password);
             final SavePasswordCommand cmd =
-                    new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), networkModel.getExecuteInSeqNtwkElmtCmd());
-            cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-            cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
+                    new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), _networkModel.getExecuteInSeqNtwkElmtCmd());
+            cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+            cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
             cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
             cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
 
@@ -84,22 +84,22 @@ public class SshKeyToRouterRules extends RuleApplier {
     }
 
     public VirtualMachineProfile getProfile() {
-        return profile;
+        return _profile;
     }
 
     public String getSshPublicKey() {
-        return sshPublicKey;
+        return _sshPublicKey;
     }
 
     public UserVmVO getUserVM() {
-        return userVM;
+        return _userVM;
     }
 
     public NicVO getNicVo() {
-        return nicVo;
+        return _nicVo;
     }
 
     public VMTemplateVO getTemplate() {
-        return template;
+        return _template;
     }
 }
\ No newline at end of file
diff --git a/server/src/com/cloud/network/rules/StaticNatRules.java b/server/src/com/cloud/network/rules/StaticNatRules.java
index b37386c34b0..dc14c9f93ea 100644
--- a/server/src/com/cloud/network/rules/StaticNatRules.java
+++ b/server/src/com/cloud/network/rules/StaticNatRules.java
@@ -34,20 +34,20 @@ import com.cloud.network.router.VirtualRouter;
 
 public class StaticNatRules extends RuleApplier {
 
-    private final List<? extends StaticNat> rules;
+    private final List<? extends StaticNat> _rules;
 
     public StaticNatRules(final Network network, final List<? extends StaticNat> rules) {
         super(network);
-        this.rules = rules;
+        _rules = rules;
     }
 
     public List<? extends StaticNat> getRules() {
-        return rules;
+        return _rules;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
         return visitor.visit(this);
     }
 
@@ -55,7 +55,7 @@ public class StaticNatRules extends RuleApplier {
         List<StaticNatRuleTO> rulesTO = new ArrayList<StaticNatRuleTO>();
         if (rules != null) {
             for (final StaticNat rule : rules) {
-                final IpAddress sourceIp = networkModel.getIp(rule.getSourceIpAddressId());
+                final IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId());
                 final StaticNatRuleTO ruleTO =
                         new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false);
                 rulesTO.add(ruleTO);
@@ -63,11 +63,11 @@ public class StaticNatRules extends RuleApplier {
         }
 
         final SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO, router.getVpcId());
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
 
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
         cmds.addCommand(cmd);
     }
diff --git a/server/src/com/cloud/network/rules/UserdataPwdRules.java b/server/src/com/cloud/network/rules/UserdataPwdRules.java
index f107906194b..ab6fc0c1fc6 100644
--- a/server/src/com/cloud/network/rules/UserdataPwdRules.java
+++ b/server/src/com/cloud/network/rules/UserdataPwdRules.java
@@ -42,7 +42,7 @@ public class UserdataPwdRules extends RuleApplier {
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        this._router = router;
 
         return visitor.visit(this);
     }
diff --git a/server/src/com/cloud/network/rules/UserdataToRouterRules.java b/server/src/com/cloud/network/rules/UserdataToRouterRules.java
index f7f8d3a66a8..477342df17f 100644
--- a/server/src/com/cloud/network/rules/UserdataToRouterRules.java
+++ b/server/src/com/cloud/network/rules/UserdataToRouterRules.java
@@ -29,37 +29,37 @@ import com.cloud.vm.VirtualMachineProfile;
 
 public class UserdataToRouterRules extends RuleApplier {
 
-    private final NicProfile nic;
-    private final VirtualMachineProfile profile;
+    private final NicProfile _nic;
+    private final VirtualMachineProfile _profile;
 
-    private NicVO nicVo;
-    private UserVmVO userVM;
+    private NicVO _nicVo;
+    private UserVmVO _userVM;
 
     public UserdataToRouterRules(final Network network, final NicProfile nic, final VirtualMachineProfile profile) {
         super(network);
 
-        this.nic = nic;
-        this.profile = profile;
+        _nic = nic;
+        _profile = profile;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
 
-        userVM = userVmDao.findById(profile.getVirtualMachine().getId());
-        userVmDao.loadDetails(userVM);
+        _userVM = _userVmDao.findById(_profile.getVirtualMachine().getId());
+        _userVmDao.loadDetails(_userVM);
 
         // for basic zone, send vm data/password information only to the router in the same pod
-        nicVo = nicDao.findById(nic.getId());
+        _nicVo = _nicDao.findById(_nic.getId());
 
         return visitor.visit(this);
     }
 
     public NicVO getNicVo() {
-        return nicVo;
+        return _nicVo;
     }
 
     public UserVmVO getUserVM() {
-        return userVM;
+        return _userVM;
     }
 }
\ No newline at end of file
diff --git a/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java b/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
index b6723608a32..e9126b7852f 100644
--- a/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
+++ b/server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
@@ -47,52 +47,52 @@ import com.cloud.vm.dao.UserVmDao;
 public class VirtualNetworkApplianceFactory {
 
     @Inject
-    protected NetworkModel networkModel;
+    protected NetworkModel _networkModel;
 
     @Inject
-    protected LoadBalancingRulesManager lbMgr;
+    protected LoadBalancingRulesManager _lbMgr;
 
     @Inject
-    protected LoadBalancerDao loadBalancerDao;
+    protected LoadBalancerDao _loadBalancerDao;
 
     @Inject
-    protected ConfigurationDao configDao;
+    protected ConfigurationDao _configDao;
 
     @Inject
-    protected NicDao nicDao;
+    protected NicDao _nicDao;
 
     @Inject
-    protected VirtualMachineManager itMgr;
+    protected VirtualMachineManager _itMgr;
 
     @Inject
-    protected NetworkOfferingDao networkOfferingDao;
+    protected NetworkOfferingDao _networkOfferingDao;
 
     @Inject
-    protected DataCenterDao dcDao;
+    protected DataCenterDao _dcDao;
 
     @Inject
-    protected UserVmDao userVmDao;
+    protected UserVmDao _userVmDao;
 
     @Inject
-    protected ServiceOfferingDao serviceOfferingDao;
+    protected ServiceOfferingDao _serviceOfferingDao;
 
     @Inject
-    protected VMTemplateDao templateDao;
+    protected VMTemplateDao _templateDao;
 
     @Inject
-    protected DomainRouterDao routerDao;
+    protected DomainRouterDao _routerDao;
 
     @Inject
-    protected NetworkDao networkDao;
+    protected NetworkDao _networkDao;
 
     @Inject
-    protected FirewallRulesDao rulesDao;
+    protected FirewallRulesDao _rulesDao;
 
     @Inject
-    protected RouterControlHelper routerControlHelper;
+    protected RouterControlHelper _routerControlHelper;
 
     @Inject
-    protected NEWVirtualNetworkApplianceManager applianceManager;
+    protected NEWVirtualNetworkApplianceManager _applianceManager;
 
 
     public LoadBalancingRules createLoadBalancingRules(final Network network,
@@ -110,8 +110,8 @@ public class VirtualNetworkApplianceFactory {
 
         initBeans(fwRules);
 
-        fwRules.networkDao = networkDao;
-        fwRules.rulesDao = rulesDao;
+        fwRules._networkDao = _networkDao;
+        fwRules._rulesDao = _rulesDao;
 
         return fwRules;
     }
@@ -126,17 +126,17 @@ public class VirtualNetworkApplianceFactory {
     }
 
     private void initBeans(final RuleApplier applier) {
-        applier.networkModel = networkModel;
-        applier.dcDao = dcDao;
-        applier.lbMgr = lbMgr;
-        applier.loadBalancerDao = loadBalancerDao;
-        applier.configDao = configDao;
-        applier.nicDao = nicDao;
-        applier.itMgr = itMgr;
-        applier.networkOfferingDao = networkOfferingDao;
-        applier.routerDao = routerDao;
-        applier.routerControlHelper = routerControlHelper;
-        applier.applianceManager = applianceManager;
+        applier._networkModel = _networkModel;
+        applier._dcDao = _dcDao;
+        applier._lbMgr = _lbMgr;
+        applier._loadBalancerDao = _loadBalancerDao;
+        applier._configDao = _configDao;
+        applier._nicDao = _nicDao;
+        applier._itMgr = _itMgr;
+        applier._networkOfferingDao = _networkOfferingDao;
+        applier._routerDao = _routerDao;
+        applier._routerControlHelper = _routerControlHelper;
+        applier._applianceManager = _applianceManager;
     }
 
     public IpAssociationRules createIpAssociationRules(final Network network, final List<? extends PublicIpAddress> ipAddresses) {
@@ -144,7 +144,7 @@ public class VirtualNetworkApplianceFactory {
 
         initBeans(ipAssociationRules);
 
-        ipAssociationRules.networkDao = networkDao;
+        ipAssociationRules._networkDao = _networkDao;
 
         return ipAssociationRules;
     }
@@ -162,7 +162,7 @@ public class VirtualNetworkApplianceFactory {
 
         initBeans(routerRules);
 
-        routerRules.userVmDao = userVmDao;
+        routerRules._userVmDao = _userVmDao;
 
         return routerRules;
     }
@@ -172,9 +172,9 @@ public class VirtualNetworkApplianceFactory {
 
         initBeans(sshKeyToRouterRules);
 
-        sshKeyToRouterRules.userVmDao = userVmDao;
-        sshKeyToRouterRules.templateDao = templateDao;
-        sshKeyToRouterRules.serviceOfferingDao = serviceOfferingDao;
+        sshKeyToRouterRules._userVmDao = _userVmDao;
+        sshKeyToRouterRules._templateDao = _templateDao;
+        sshKeyToRouterRules._serviceOfferingDao = _serviceOfferingDao;
 
         return sshKeyToRouterRules;
     }
@@ -184,9 +184,9 @@ public class VirtualNetworkApplianceFactory {
 
         initBeans(userdataRules);
 
-        userdataRules.userVmDao = userVmDao;
-        userdataRules.templateDao = templateDao;
-        userdataRules.serviceOfferingDao = serviceOfferingDao;
+        userdataRules._userVmDao = _userVmDao;
+        userdataRules._templateDao = _templateDao;
+        userdataRules._serviceOfferingDao = _serviceOfferingDao;
 
         return userdataRules;
     }
diff --git a/server/src/com/cloud/network/rules/VpcIpAssociationRules.java b/server/src/com/cloud/network/rules/VpcIpAssociationRules.java
index 978e6fd922f..5c0d6fe2aa3 100644
--- a/server/src/com/cloud/network/rules/VpcIpAssociationRules.java
+++ b/server/src/com/cloud/network/rules/VpcIpAssociationRules.java
@@ -28,21 +28,21 @@ import com.cloud.network.router.VirtualRouter;
 
 public class VpcIpAssociationRules extends RuleApplier {
 
-    private final List<? extends PublicIpAddress> ipAddresses;
+    private final List<? extends PublicIpAddress> _ipAddresses;
 
     public VpcIpAssociationRules(final Network network, final List<? extends PublicIpAddress> ipAddresses) {
         super(network);
-        this.ipAddresses = ipAddresses;
+        _ipAddresses = ipAddresses;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
 
         return visitor.visit(this);
     }
 
     public List<? extends PublicIpAddress> getIpAddresses() {
-        return ipAddresses;
+        return _ipAddresses;
     }
 }
\ No newline at end of file
diff --git a/server/src/com/cloud/network/rules/VpnRules.java b/server/src/com/cloud/network/rules/VpnRules.java
index e50cf2d32fb..fa4d1ea0364 100644
--- a/server/src/com/cloud/network/rules/VpnRules.java
+++ b/server/src/com/cloud/network/rules/VpnRules.java
@@ -33,16 +33,16 @@ import com.cloud.network.router.VirtualRouter;
 
 public class VpnRules extends RuleApplier {
 
-    private final List<? extends VpnUser> users;
+    private final List<? extends VpnUser> _users;
 
     public VpnRules(final Network network, final List<? extends VpnUser> users) {
         super(network);
-        this.users = users;
+        _users = users;
     }
 
     @Override
     public boolean accept(final NetworkTopologyVisitor visitor, final VirtualRouter router) throws ResourceUnavailableException {
-        this.router = router;
+        _router = router;
 
         return visitor.visit(this);
     }
@@ -60,15 +60,15 @@ public class VpnRules extends RuleApplier {
 
         final VpnUsersCfgCommand cmd = new VpnUsersCfgCommand(addUsers, removeUsers);
         cmd.setAccessDetail(NetworkElementCommand.ACCOUNT_ID, String.valueOf(router.getAccountId()));
-        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, routerControlHelper.getRouterControlIp(router.getId()));
+        cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
-        final DataCenterVO dcVo = dcDao.findById(router.getDataCenterId());
+        final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
         cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
 
         cmds.addCommand("users", cmd);
     }
 
     public List<? extends VpnUser> getUsers() {
-        return users;
+        return _users;
     }
 }
\ No newline at end of file
diff --git a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
index 21ccbb1c3e7..49cc2fbace7 100644
--- a/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
+++ b/server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
@@ -100,6 +100,6 @@ public class AdvancedNetworkTopology implements NetworkTopology {
 
     @Autowired
     @Qualifier("advancedNetworkVisitor")
-    protected AdvancedNetworkVisitor advancedVisitor;
+    protected AdvancedNetworkVisitor _advancedVisitor;
 
 }
\ No newline at end of file
diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
index 83bd8aeda44..c70fd909011 100644
--- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
+++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
@@ -19,7 +19,6 @@ package org.apache.cloudstack.network.topology;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -33,7 +32,6 @@ import com.cloud.dc.Pod;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
@@ -55,7 +53,6 @@ import com.cloud.network.rules.StaticNatRules;
 import com.cloud.network.rules.UserdataToRouterRules;
 import com.cloud.network.rules.VirtualNetworkApplianceFactory;
 import com.cloud.network.rules.VpnRules;
-import com.cloud.user.Account;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.UserVmVO;
@@ -68,11 +65,11 @@ public class BasicNetworkTopology implements NetworkTopology {
     private static final Logger s_logger = Logger.getLogger(BasicNetworkTopology.class);
 
     @Inject
-    protected VirtualNetworkApplianceFactory virtualNetworkApplianceFactory;
+    protected VirtualNetworkApplianceFactory _virtualNetworkApplianceFactory;
 
     @Autowired
     @Qualifier("basicNetworkVisitor")
-    protected BasicNetworkVisitor basicVisitor;
+    protected BasicNetworkVisitor _basicVisitor;
 
     @Inject
     protected DataCenterDao _dcDao;
@@ -83,12 +80,6 @@ public class BasicNetworkTopology implements NetworkTopology {
     @Inject
     protected UserVmDao _userVmDao;
 
-    @Override
-    public List<DomainRouterVO> findOrDeployVirtualRouterInGuestNetwork(final Network guestNetwork, final DeployDestination dest, final Account owner, final boolean isRedundant,
-            final Map<Param, Object> params) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
-        return null;
-    }
-
     @Override
     public StringBuilder createGuestBootLoadArgs(final NicProfile guestNic, final String defaultDns1, final String defaultDns2, final DomainRouterVO router) {
         return null;
@@ -138,7 +129,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        LoadBalancingRules loadBalancingRules = virtualNetworkApplianceFactory.createLoadBalancingRules(network, rules);
+        LoadBalancingRules loadBalancingRules = _virtualNetworkApplianceFactory.createLoadBalancingRules(network, rules);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(loadBalancingRules));
     }
@@ -158,7 +149,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        FirewallRules firewallRules = virtualNetworkApplianceFactory.createFirewallRules(network, rules);
+        FirewallRules firewallRules = _virtualNetworkApplianceFactory.createFirewallRules(network, rules);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(firewallRules));
     }
@@ -177,7 +168,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        StaticNatRules natRules = virtualNetworkApplianceFactory.createStaticNatRules(network, rules);
+        StaticNatRules natRules = _virtualNetworkApplianceFactory.createStaticNatRules(network, rules);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(natRules));
     }
@@ -197,7 +188,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        IpAssociationRules ipAddresses = virtualNetworkApplianceFactory.createIpAssociationRules(network, ipAddress);
+        IpAssociationRules ipAddresses = _virtualNetworkApplianceFactory.createIpAssociationRules(network, ipAddress);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(ipAddresses));
     }
@@ -220,12 +211,12 @@ public class BasicNetworkTopology implements NetworkTopology {
                         network.getDataCenterId());
             }
 
-            VpnRules vpnRules = virtualNetworkApplianceFactory.createVpnRules(network, users);
+            VpnRules vpnRules = _virtualNetworkApplianceFactory.createVpnRules(network, users);
 
             // Currently we receive just one answer from the agent. In the
             // future we have to parse individual answers and set
             // results accordingly
-            final boolean agentResult = vpnRules.accept(basicVisitor, router);
+            final boolean agentResult = vpnRules.accept(_basicVisitor, router);
             agentResults = agentResults && agentResult;
         }
 
@@ -254,7 +245,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        PasswordToRouterRules routerRules = virtualNetworkApplianceFactory.createPasswordToRouterRules(network, nic, profile);
+        PasswordToRouterRules routerRules = _virtualNetworkApplianceFactory.createPasswordToRouterRules(network, nic, profile);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(routerRules));
     }
@@ -269,7 +260,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        SshKeyToRouterRules keyToRouterRules = virtualNetworkApplianceFactory.createSshKeyToRouterRules(network, nic, profile, sshPublicKey);
+        SshKeyToRouterRules keyToRouterRules = _virtualNetworkApplianceFactory.createSshKeyToRouterRules(network, nic, profile, sshPublicKey);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(keyToRouterRules));
     }
@@ -284,7 +275,7 @@ public class BasicNetworkTopology implements NetworkTopology {
         final boolean failWhenDisconnect = false;
         final Long podId = null;
 
-        UserdataToRouterRules userdataToRouterRules = virtualNetworkApplianceFactory.createUserdataToRouterRules(network, nic, profile);
+        UserdataToRouterRules userdataToRouterRules = _virtualNetworkApplianceFactory.createUserdataToRouterRules(network, nic, profile);
 
         return applyRules(network, routers, typeString, isPodLevelException, podId, failWhenDisconnect, new RuleApplierWrapper<RuleApplier>(userdataToRouterRules));
     }
@@ -324,7 +315,7 @@ public class BasicNetworkTopology implements NetworkTopology {
                 }
 
                 try {
-                    ruleApplier.accept(basicVisitor, router);
+                    ruleApplier.accept(_basicVisitor, router);
 
                     connectedRouters.add(router);
                 } catch (final AgentUnavailableException e) {
diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
index a787d9b2ec8..40b8d9424cf 100644
--- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
+++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
@@ -66,7 +66,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
     }
 
     @Inject
-    protected NEWVirtualNetworkApplianceManager applianceManager;
+    protected NEWVirtualNetworkApplianceManager _applianceManager;
 
     @Override
     public boolean visit(final StaticNatRules nat) throws ResourceUnavailableException {
@@ -77,7 +77,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final Commands cmds = new Commands(Command.OnError.Continue);
         nat.createApplyStaticNatCommands(rules, router, cmds, network.getId());
 
-        return applianceManager.sendCommandsToRouter(router, cmds);
+        return _applianceManager.sendCommandsToRouter(router, cmds);
     }
 
     @Override
@@ -89,7 +89,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final Commands cmds = new Commands(Command.OnError.Continue);
         loadbalancing.createApplyLoadBalancingRulesCommands(rules, router, cmds, network.getId());
 
-        return applianceManager.sendCommandsToRouter(router, cmds);
+        return _applianceManager.sendCommandsToRouter(router, cmds);
     }
 
     @SuppressWarnings("unchecked")
@@ -107,25 +107,25 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
 
             firewall.createApplyLoadBalancingRulesCommands(loadbalancingRules, router, cmds, network.getId());
 
-            return applianceManager.sendCommandsToRouter(router, cmds);
+            return _applianceManager.sendCommandsToRouter(router, cmds);
 
         } else if (purpose == Purpose.PortForwarding) {
 
             firewall.createApplyPortForwardingRulesCommands((List<? extends PortForwardingRule>) rules, router, cmds, network.getId());
 
-            return applianceManager.sendCommandsToRouter(router, cmds);
+            return _applianceManager.sendCommandsToRouter(router, cmds);
 
         } else if (purpose == Purpose.StaticNat) {
 
             firewall.createApplyStaticNatRulesCommands((List<StaticNatRule>) rules, router, cmds, network.getId());
 
-            return applianceManager.sendCommandsToRouter(router, cmds);
+            return _applianceManager.sendCommandsToRouter(router, cmds);
 
         } else if (purpose == Purpose.Firewall) {
 
             firewall.createApplyFirewallRulesCommands(rules, router, cmds, network.getId());
 
-            return applianceManager.sendCommandsToRouter(router, cmds);
+            return _applianceManager.sendCommandsToRouter(router, cmds);
 
         }
         s_logger.warn("Unable to apply rules of purpose: " + rules.get(0).getPurpose());
@@ -142,7 +142,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final List<? extends PublicIpAddress> ips = ipRules.getIpAddresses();
 
         ipRules.createAssociateIPCommands(router, ips, commands, network.getId());
-        return applianceManager.sendCommandsToRouter(router, commands);
+        return _applianceManager.sendCommandsToRouter(router, commands);
     }
 
     @Override
@@ -172,7 +172,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
 
         sshkey.createVmDataCommand(router, userVM, nicVo, sshKeystr, commands);
 
-        return applianceManager.sendCommandsToRouter(router, commands);
+        return _applianceManager.sendCommandsToRouter(router, commands);
     }
 
     @Override
@@ -184,7 +184,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final Commands cmds = new Commands(Command.OnError.Stop);
         passwd.createPasswordCommand(router, profile, nicVo, cmds);
 
-        return applianceManager.sendCommandsToRouter(router, cmds);
+        return _applianceManager.sendCommandsToRouter(router, cmds);
     }
 
     @Override
@@ -207,7 +207,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final Commands commands = new Commands(Command.OnError.Stop);
         userdata.createVmDataCommand(router, userVM, nicVo, null, commands);
 
-        return applianceManager.sendCommandsToRouter(router, commands);
+        return _applianceManager.sendCommandsToRouter(router, commands);
     }
 
     @Override
@@ -223,7 +223,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final Commands cmds = new Commands(Command.OnError.Continue);
         vpn.createApplyVpnUsersCommand(users, router, cmds);
 
-        return applianceManager.sendCommandsToRouter(router, cmds);
+        return _applianceManager.sendCommandsToRouter(router, cmds);
     }
 
     @Override
diff --git a/server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java b/server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java
index 42c9b5bfc11..bbe58dda379 100644
--- a/server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java
+++ b/server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java
@@ -26,24 +26,24 @@ import com.cloud.dc.DataCenter.NetworkType;
 
 public class NetworkTopologyContext {
 
-    private final Hashtable<NetworkType, NetworkTopology> flyweight = new Hashtable<DataCenter.NetworkType, NetworkTopology>();;
+    private final Hashtable<NetworkType, NetworkTopology> _flyweight = new Hashtable<DataCenter.NetworkType, NetworkTopology>();;
 
     @Inject
-    private BasicNetworkTopology basicNetworkTopology;
+    private BasicNetworkTopology _basicNetworkTopology;
 
     @Inject
-    private AdvancedNetworkTopology advancedNetworkTopology;
+    private AdvancedNetworkTopology _advancedNetworkTopology;
 
     public void init() {
-        flyweight.put(NetworkType.Basic, basicNetworkTopology);
-        flyweight.put(NetworkType.Advanced, advancedNetworkTopology);
+        _flyweight.put(NetworkType.Basic, _basicNetworkTopology);
+        _flyweight.put(NetworkType.Advanced, _advancedNetworkTopology);
     }
 
     public NetworkTopology retrieveNetworkTopology(final DataCenter dc) {
-        if (!flyweight.containsKey(dc.getNetworkType())) {
+        if (!_flyweight.containsKey(dc.getNetworkType())) {
             throw new IllegalArgumentException("The given type cannot be related to a NetworkTopology implementation. "
                     + "Please, give a correct type.");
         }
-        return flyweight.get(dc.getNetworkType());
+        return _flyweight.get(dc.getNetworkType());
     }
 }
\ No newline at end of file