diff --git a/doc/ChangeLog b/doc/ChangeLog
index f8b4dfc17..8056336df 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-20  vadim  <vadim@netcitadel.com>
+
+	* NamedObjectsAndGroupsSupport.cpp (processNext): made names
+	automatically assigned to object-groups in generated PIX
+	configuration shorter by removing interface label prefix.
+
 2011-01-19  vadim  <vadim@netcitadel.com>
 
 	* PolicyCompiler_pix.cpp (compile): See #1959 "ASA Policy - ranges
diff --git a/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp b/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
index b4c7ea784..ebcdebb9f 100644
--- a/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
+++ b/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
@@ -192,8 +192,8 @@ bool CreateObjectGroups::processNext()
         obj_group->setObjectGroupTypeFromMembers(named_objects_manager);
 
         QStringList group_name_prefix;
-        if (!rule_iface->getLabel().empty())
-            group_name_prefix.push_back(rule_iface->getLabel().c_str());
+        // if (!rule_iface->getLabel().empty())
+        //     group_name_prefix.push_back(rule_iface->getLabel().c_str());
 
         group_name_prefix.push_back(rule->getUniqueId().c_str());
         group_name_prefix.push_back(name_suffix.c_str());
diff --git a/test/pix/cluster1-1_pix1.fw.orig b/test/pix/cluster1-1_pix1.fw.orig
index 256e6bd57..c483d30aa 100755
--- a/test/pix/cluster1-1_pix1.fw.orig
+++ b/test/pix/cluster1-1_pix1.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:56 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:31 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
@@ -120,33 +120,33 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group network outside.id56590X61097.src.net.0
+object-group network id56590X61097.src.net.0
   network-object host 10.3.14.206 
   network-object host 10.3.14.207 
 exit
 
-object-group network outside.id56590X61097.src.net.1
+object-group network id56590X61097.src.net.1
   network-object host 172.17.1.253 
   network-object host 172.17.1.254 
   network-object host 192.0.2.253 
   network-object host 192.0.2.254 
 exit
 
-object-group network outside.id56590X61097.src.net.2
+object-group network id56590X61097.src.net.2
   network-object host 10.0.0.253 
   network-object host 10.0.0.254 
 exit
 
-object-group network inside.id56627X61097.src.net.0
+object-group network id56627X61097.src.net.0
   network-object host 172.17.1.253 
   network-object host 192.0.2.253 
 exit
 ! 
 ! Rule  0 (Ethernet0.101)
 ! anti spoofing rule
-access-list outside_in deny   ip object-group outside.id56590X61097.src.net.0 any log 2 interval 300
-access-list outside_in deny   ip object-group outside.id56590X61097.src.net.1 any log 2 interval 300
-access-list outside_in deny   ip object-group outside.id56590X61097.src.net.2 any log 2 interval 300
+access-list outside_in deny   ip object-group id56590X61097.src.net.0 any log 2 interval 300
+access-list outside_in deny   ip object-group id56590X61097.src.net.1 any log 2 interval 300
+access-list outside_in deny   ip object-group id56590X61097.src.net.2 any log 2 interval 300
 access-list outside_in deny   ip 10.3.14.0 255.255.255.0 any log 2 interval 300
 ! 
 ! Rule  1 (global)
@@ -161,22 +161,22 @@ ssh    10.3.14.0 255.255.255.0 inside
 ! Firewall uses one of the machines
 ! on internal network for DNS
 access-list inside_out permit udp host 10.3.14.206 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
-access-list inside_out permit udp object-group inside.id56627X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id56627X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
 access-list inside_out permit udp host 10.0.0.253 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
 ! 
 ! Rule  4 (global)
 ! Firewall uses one of the machines
 ! on internal network for DNS
-access-list inside_out permit udp object-group outside.id56590X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
-access-list inside_out permit udp object-group outside.id56590X61097.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
-access-list inside_out permit udp object-group outside.id56590X61097.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id56590X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id56590X61097.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id56590X61097.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
 ! 
 ! Rule  5 (global)
 ! All other attempts to connect to
 ! the firewall are denied and logged
-access-list inside_in deny   ip any object-group outside.id56590X61097.src.net.0 log 2 interval 300
-access-list inside_in deny   ip any object-group outside.id56590X61097.src.net.1 log 2 interval 300
-access-list inside_in deny   ip any object-group outside.id56590X61097.src.net.2 log 2 interval 300
+access-list inside_in deny   ip any object-group id56590X61097.src.net.0 log 2 interval 300
+access-list inside_in deny   ip any object-group id56590X61097.src.net.1 log 2 interval 300
+access-list inside_in deny   ip any object-group id56590X61097.src.net.2 log 2 interval 300
 ! 
 ! Rule  6 (global)
 access-list inside_in permit ip 10.3.14.0 255.255.255.0 any 
diff --git a/test/pix/cluster1-1_pix2.fw.orig b/test/pix/cluster1-1_pix2.fw.orig
index 4bebfb227..d4712961e 100755
--- a/test/pix/cluster1-1_pix2.fw.orig
+++ b/test/pix/cluster1-1_pix2.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:56 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:31 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
@@ -120,33 +120,33 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group network outside.id56590X61097.src.net.0
+object-group network id56590X61097.src.net.0
   network-object host 10.3.14.206 
   network-object host 10.3.14.207 
 exit
 
-object-group network outside.id56590X61097.src.net.1
+object-group network id56590X61097.src.net.1
   network-object host 172.17.1.253 
   network-object host 172.17.1.254 
   network-object host 192.0.2.253 
   network-object host 192.0.2.254 
 exit
 
-object-group network outside.id56590X61097.src.net.2
+object-group network id56590X61097.src.net.2
   network-object host 10.0.0.253 
   network-object host 10.0.0.254 
 exit
 
-object-group network inside.id56627X61097.src.net.0
+object-group network id56627X61097.src.net.0
   network-object host 172.17.1.253 
   network-object host 192.0.2.253 
 exit
 ! 
 ! Rule  0 (Ethernet0.101)
 ! anti spoofing rule
-access-list outside_in deny   ip object-group outside.id56590X61097.src.net.0 any log 3 interval 300
-access-list outside_in deny   ip object-group outside.id56590X61097.src.net.1 any log 3 interval 300
-access-list outside_in deny   ip object-group outside.id56590X61097.src.net.2 any log 3 interval 300
+access-list outside_in deny   ip object-group id56590X61097.src.net.0 any log 3 interval 300
+access-list outside_in deny   ip object-group id56590X61097.src.net.1 any log 3 interval 300
+access-list outside_in deny   ip object-group id56590X61097.src.net.2 any log 3 interval 300
 access-list outside_in deny   ip 10.3.14.0 255.255.255.0 any log 3 interval 300
 ! 
 ! Rule  1 (global)
@@ -161,22 +161,22 @@ ssh    10.3.14.0 255.255.255.0 inside
 ! Firewall uses one of the machines
 ! on internal network for DNS
 access-list inside_out permit udp host 10.3.14.206 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
-access-list inside_out permit udp object-group inside.id56627X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id56627X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
 access-list inside_out permit udp host 10.0.0.253 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
 ! 
 ! Rule  4 (global)
 ! Firewall uses one of the machines
 ! on internal network for DNS
-access-list inside_out permit udp object-group outside.id56590X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
-access-list inside_out permit udp object-group outside.id56590X61097.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
-access-list inside_out permit udp object-group outside.id56590X61097.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id56590X61097.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id56590X61097.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id56590X61097.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
 ! 
 ! Rule  5 (global)
 ! All other attempts to connect to
 ! the firewall are denied and logged
-access-list inside_in deny   ip any object-group outside.id56590X61097.src.net.0 log 3 interval 300
-access-list inside_in deny   ip any object-group outside.id56590X61097.src.net.1 log 3 interval 300
-access-list inside_in deny   ip any object-group outside.id56590X61097.src.net.2 log 3 interval 300
+access-list inside_in deny   ip any object-group id56590X61097.src.net.0 log 3 interval 300
+access-list inside_in deny   ip any object-group id56590X61097.src.net.1 log 3 interval 300
+access-list inside_in deny   ip any object-group id56590X61097.src.net.2 log 3 interval 300
 ! 
 ! Rule  6 (global)
 access-list inside_in permit ip 10.3.14.0 255.255.255.0 any 
diff --git a/test/pix/cluster1_pix1.fw.orig b/test/pix/cluster1_pix1.fw.orig
index 3cd1b8857..bc8580cdd 100755
--- a/test/pix/cluster1_pix1.fw.orig
+++ b/test/pix/cluster1_pix1.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:55 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:31 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
@@ -120,33 +120,33 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group network outside.id2913X78273.src.net.0
+object-group network id2913X78273.src.net.0
   network-object host 10.3.14.206 
   network-object host 10.3.14.207 
 exit
 
-object-group network outside.id2913X78273.src.net.1
+object-group network id2913X78273.src.net.1
   network-object host 172.17.1.253 
   network-object host 172.17.1.254 
   network-object host 192.0.2.253 
   network-object host 192.0.2.254 
 exit
 
-object-group network outside.id2913X78273.src.net.2
+object-group network id2913X78273.src.net.2
   network-object host 10.0.0.253 
   network-object host 10.0.0.254 
 exit
 
-object-group network inside.id55439X897.src.net.0
+object-group network id55439X897.src.net.0
   network-object host 172.17.1.253 
   network-object host 192.0.2.253 
 exit
 ! 
 ! Rule  0 (Ethernet0.101)
 ! anti spoofing rule
-access-list outside_in deny   ip object-group outside.id2913X78273.src.net.0 any log 2 interval 300
-access-list outside_in deny   ip object-group outside.id2913X78273.src.net.1 any log 2 interval 300
-access-list outside_in deny   ip object-group outside.id2913X78273.src.net.2 any log 2 interval 300
+access-list outside_in deny   ip object-group id2913X78273.src.net.0 any log 2 interval 300
+access-list outside_in deny   ip object-group id2913X78273.src.net.1 any log 2 interval 300
+access-list outside_in deny   ip object-group id2913X78273.src.net.2 any log 2 interval 300
 access-list outside_in deny   ip 10.3.14.0 255.255.255.0 any log 2 interval 300
 ! 
 ! Rule  1 (global)
@@ -161,15 +161,15 @@ ssh    10.3.14.0 255.255.255.0 inside
 ! Firewall uses one of the machines
 ! on internal network for DNS
 access-list inside_out permit udp host 10.3.14.206 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
-access-list inside_out permit udp object-group inside.id55439X897.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id55439X897.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
 access-list inside_out permit udp host 10.0.0.253 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
 ! 
 ! Rule  4 (global)
 ! Firewall uses one of the machines
 ! on internal network for DNS
-access-list inside_out permit udp object-group outside.id2913X78273.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
-access-list inside_out permit udp object-group outside.id2913X78273.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
-access-list inside_out permit udp object-group outside.id2913X78273.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id2913X78273.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id2913X78273.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
+access-list inside_out permit udp object-group id2913X78273.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 2 interval 300
 ! 
 ! Rule  5 (Ethernet0.101,Ethernet0.102)
 ssh    0.0.0.0 0.0.0.0 outside
@@ -214,9 +214,9 @@ access-list dmz20_out permit udp any 10.3.14.0 255.255.255.0 eq 53
 ! Rule  9 (global)
 ! All other attempts to connect to
 ! the firewall are denied and logged
-access-list inside_in deny   ip any object-group outside.id2913X78273.src.net.0 log 2 interval 300
-access-list inside_in deny   ip any object-group outside.id2913X78273.src.net.1 log 2 interval 300
-access-list inside_in deny   ip any object-group outside.id2913X78273.src.net.2 log 2 interval 300
+access-list inside_in deny   ip any object-group id2913X78273.src.net.0 log 2 interval 300
+access-list inside_in deny   ip any object-group id2913X78273.src.net.1 log 2 interval 300
+access-list inside_in deny   ip any object-group id2913X78273.src.net.2 log 2 interval 300
 ! 
 ! Rule  10 (global)
 access-list inside_in permit ip 10.3.14.0 255.255.255.0 any 
diff --git a/test/pix/cluster1_pix2.fw.orig b/test/pix/cluster1_pix2.fw.orig
index 511c01f3b..d8d0173bf 100755
--- a/test/pix/cluster1_pix2.fw.orig
+++ b/test/pix/cluster1_pix2.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:55 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:31 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
@@ -120,38 +120,38 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group network outside.id2913X78273.src.net.0
+object-group network id2913X78273.src.net.0
   network-object host 10.3.14.206 
   network-object host 10.3.14.207 
 exit
 
-object-group network outside.id2913X78273.src.net.1
+object-group network id2913X78273.src.net.1
   network-object host 172.17.1.253 
   network-object host 172.17.1.254 
   network-object host 192.0.2.253 
   network-object host 192.0.2.254 
 exit
 
-object-group network outside.id2913X78273.src.net.2
+object-group network id2913X78273.src.net.2
   network-object host 10.0.0.253 
   network-object host 10.0.0.254 
 exit
 
-object-group network inside.id55439X897.src.net.0
+object-group network id55439X897.src.net.0
   network-object host 172.17.1.253 
   network-object host 192.0.2.253 
 exit
 
-object-group network outside.id3401X82678.dst.net.0
+object-group network id3401X82678.dst.net.0
   network-object host 172.17.1.254 
   network-object host 192.0.2.254 
 exit
 ! 
 ! Rule  0 (Ethernet0.101)
 ! anti spoofing rule
-access-list outside_in deny   ip object-group outside.id2913X78273.src.net.0 any log 3 interval 300
-access-list outside_in deny   ip object-group outside.id2913X78273.src.net.1 any log 3 interval 300
-access-list outside_in deny   ip object-group outside.id2913X78273.src.net.2 any log 3 interval 300
+access-list outside_in deny   ip object-group id2913X78273.src.net.0 any log 3 interval 300
+access-list outside_in deny   ip object-group id2913X78273.src.net.1 any log 3 interval 300
+access-list outside_in deny   ip object-group id2913X78273.src.net.2 any log 3 interval 300
 access-list outside_in deny   ip 10.3.14.0 255.255.255.0 any log 3 interval 300
 ! 
 ! Rule  1 (global)
@@ -166,15 +166,15 @@ ssh    10.3.14.0 255.255.255.0 inside
 ! Firewall uses one of the machines
 ! on internal network for DNS
 access-list inside_out permit udp host 10.3.14.206 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
-access-list inside_out permit udp object-group inside.id55439X897.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id55439X897.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
 access-list inside_out permit udp host 10.0.0.253 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
 ! 
 ! Rule  4 (global)
 ! Firewall uses one of the machines
 ! on internal network for DNS
-access-list inside_out permit udp object-group outside.id2913X78273.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
-access-list inside_out permit udp object-group outside.id2913X78273.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
-access-list inside_out permit udp object-group outside.id2913X78273.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id2913X78273.src.net.0 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id2913X78273.src.net.1 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
+access-list inside_out permit udp object-group id2913X78273.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300
 ! 
 ! Rule  5 (Ethernet0.101,Ethernet0.102)
 ssh    0.0.0.0 0.0.0.0 outside
@@ -219,9 +219,9 @@ access-list dmz20_out permit udp any 10.3.14.0 255.255.255.0 eq 53
 ! Rule  9 (global)
 ! All other attempts to connect to
 ! the firewall are denied and logged
-access-list inside_in deny   ip any object-group outside.id2913X78273.src.net.0 log 3 interval 300
-access-list inside_in deny   ip any object-group outside.id2913X78273.src.net.1 log 3 interval 300
-access-list inside_in deny   ip any object-group outside.id2913X78273.src.net.2 log 3 interval 300
+access-list inside_in deny   ip any object-group id2913X78273.src.net.0 log 3 interval 300
+access-list inside_in deny   ip any object-group id2913X78273.src.net.1 log 3 interval 300
+access-list inside_in deny   ip any object-group id2913X78273.src.net.2 log 3 interval 300
 ! 
 ! Rule  10 (global)
 access-list inside_in permit ip 10.3.14.0 255.255.255.0 any 
diff --git a/test/pix/firewall.fw.orig b/test/pix/firewall.fw.orig
index 22a4bc062..68bc58bfa 100755
--- a/test/pix/firewall.fw.orig
+++ b/test/pix/firewall.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:42 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:17 2011 PST by vadim
 !
 ! Compiled for pix 6.2
 ! Outbound ACLs: not supported
@@ -279,12 +279,12 @@ clear object-group
 clear icmp
 clear telnet
 
-object-group network inside.id3C4E4C38.dst.net.0
+object-group network id3C4E4C38.dst.net.0
   network-object host 211.11.11.11 
   network-object host 211.22.22.22 
 exit
 
-object-group service inside.id3C4E4C38.srv.tcp.0 tcp
+object-group service id3C4E4C38.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -294,40 +294,40 @@ object-group service inside.id3C4E4C38.srv.tcp.0 tcp
   port-object eq 143
 exit
 
-object-group icmp-type outside.id3D8FCE32.srv.icmp.0
+object-group icmp-type id3D8FCE32.srv.icmp.0
   icmp-object 11
   icmp-object 0
   icmp-object 3
 exit
 
-object-group service outside.pol-firewall2-2.srv.tcp.0 tcp
+object-group service pol-firewall2-2.srv.tcp.0 tcp
   port-object eq 3128
   port-object eq 70
   port-object eq 6667
   port-object eq 23
 exit
 
-object-group service outside.pol-firewall2-2.srv.udp.0 udp
+object-group service pol-firewall2-2.srv.udp.0 udp
   port-object eq 161
   port-object eq 53
 exit
 
-object-group network outside.pol-firewall2-3.dst.net.0
+object-group network pol-firewall2-3.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
 
-object-group network inside.id3E155E82.dst.net.0
+object-group network id3E155E82.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id3D0F8031.dst.net.0
+object-group network id3D0F8031.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id3CD87B1E.dst.net.0
+object-group network id3CD87B1E.dst.net.0
   network-object host 192.168.1.11 
   network-object host 192.168.1.12 
   network-object host 192.168.1.13 
@@ -335,7 +335,7 @@ object-group network outside.id3CD87B1E.dst.net.0
   network-object host 192.168.1.15 
 exit
 
-object-group service outside.id3CD87B1E.srv.tcp.0 tcp
+object-group service id3CD87B1E.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -346,12 +346,12 @@ object-group service outside.id3CD87B1E.srv.tcp.0 tcp
   port-object eq 3128
 exit
 
-object-group network outside.id3CD8770E.dst.net.0
+object-group network id3CD8770E.dst.net.0
   network-object 192.168.1.11 255.255.255.255 
   network-object 192.168.1.12 255.255.255.252 
 exit
 
-object-group service outside.pol-firewall2-4.srv.tcp.0 tcp
+object-group service pol-firewall2-4.srv.tcp.0 tcp
   port-object eq 3128
   port-object range 10000 11000
   port-object eq 6667
@@ -413,28 +413,28 @@ access-list inside_acl_in permit ip 192.168.1.0 255.255.255.0 any
 ssh    192.168.1.0 255.255.255.0 inside
 ! 
 ! Rule  5 (ethernet0)
-access-list inside_acl_in permit tcp any object-group inside.id3C4E4C38.dst.net.0 object-group inside.id3C4E4C38.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group inside.id3C4E4C38.dst.net.0 object-group inside.id3C4E4C38.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group inside.id3C4E4C38.dst.net.0 object-group inside.id3C4E4C38.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3C4E4C38.dst.net.0 object-group id3C4E4C38.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3C4E4C38.dst.net.0 object-group id3C4E4C38.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id3C4E4C38.dst.net.0 object-group id3C4E4C38.srv.tcp.0 
 ! 
 ! Rule  6 (ethernet0)
 access-list inside_acl_in deny   ip any host 192.168.1.255 
 ! 
 ! Rule  8 (global)
-access-list outside_acl_in permit icmp any host 192.168.1.10 object-group outside.id3D8FCE32.srv.icmp.0 
-access-list inside_acl_in permit icmp any host 192.168.1.10 object-group outside.id3D8FCE32.srv.icmp.0 
-access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group outside.id3D8FCE32.srv.icmp.0 
+access-list outside_acl_in permit icmp any host 192.168.1.10 object-group id3D8FCE32.srv.icmp.0 
+access-list inside_acl_in permit icmp any host 192.168.1.10 object-group id3D8FCE32.srv.icmp.0 
+access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group id3D8FCE32.srv.icmp.0 
 ! 
 ! Rule  9 (global)
 access-list outside_acl_in permit icmp any host 192.168.1.10 
 access-list inside_acl_in permit icmp any host 192.168.1.10 
 access-list dmz_acl_in permit icmp any host 192.168.1.10 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group outside.pol-firewall2-2.srv.tcp.0 
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group outside.pol-firewall2-2.srv.tcp.0 
-access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group outside.pol-firewall2-2.srv.tcp.0 
-access-list outside_acl_in permit udp any host 192.168.1.10 object-group outside.pol-firewall2-2.srv.udp.0 
-access-list inside_acl_in permit udp any host 192.168.1.10 object-group outside.pol-firewall2-2.srv.udp.0 
-access-list dmz_acl_in permit udp any host 192.168.1.10 object-group outside.pol-firewall2-2.srv.udp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group pol-firewall2-2.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group pol-firewall2-2.srv.tcp.0 
+access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group pol-firewall2-2.srv.tcp.0 
+access-list outside_acl_in permit udp any host 192.168.1.10 object-group pol-firewall2-2.srv.udp.0 
+access-list inside_acl_in permit udp any host 192.168.1.10 object-group pol-firewall2-2.srv.udp.0 
+access-list dmz_acl_in permit udp any host 192.168.1.10 object-group pol-firewall2-2.srv.udp.0 
 access-list outside_acl_in permit 47 any host 192.168.1.10 
 access-list inside_acl_in permit 47 any host 192.168.1.10 
 access-list dmz_acl_in permit 47 any host 192.168.1.10 
@@ -456,16 +456,16 @@ access-list inside_acl_in permit 50 any any
 access-list dmz_acl_in permit 50 any any 
 ! 
 ! Rule  12 (global)
-access-list outside_acl_in permit ip object-group inside.id3C4E4C38.dst.net.0 object-group outside.pol-firewall2-3.dst.net.0 
+access-list outside_acl_in permit ip object-group id3C4E4C38.dst.net.0 object-group pol-firewall2-3.dst.net.0 
 ! 
 ! Rule  13 (global)
 ! firewall:Policy:13: warning: MAC address matching is not supported. One or several MAC addresses removed from source in the rule
-access-list inside_acl_in permit tcp host 192.168.1.10 object-group inside.id3E155E82.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp host 192.168.1.10 object-group id3E155E82.dst.net.0 eq 3128 
 ! 
 ! Rule  14 (global)
-access-list outside_acl_in permit tcp any object-group outside.id3D0F8031.dst.net.0 eq 3128 
-access-list inside_acl_in permit tcp any object-group outside.id3D0F8031.dst.net.0 eq 3128 
-access-list dmz_acl_in permit tcp any object-group outside.id3D0F8031.dst.net.0 eq 3128 
+access-list outside_acl_in permit tcp any object-group id3D0F8031.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp any object-group id3D0F8031.dst.net.0 eq 3128 
+access-list dmz_acl_in permit tcp any object-group id3D0F8031.dst.net.0 eq 3128 
 ! 
 ! Rule  15 (global)
 access-list outside_acl_in permit icmp any host 22.22.22.22 3 
@@ -476,19 +476,19 @@ access-list inside_acl_in permit tcp any host 192.168.1.1 eq 80
 access-list dmz_acl_in permit tcp any host 192.168.2.1 eq 80 
 ! 
 ! Rule  16 (global)
-access-list outside_acl_in permit tcp any object-group outside.id3CD87B1E.dst.net.0 object-group outside.id3CD87B1E.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id3CD87B1E.dst.net.0 object-group outside.id3CD87B1E.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id3CD87B1E.dst.net.0 object-group outside.id3CD87B1E.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id3CD87B1E.dst.net.0 object-group id3CD87B1E.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3CD87B1E.dst.net.0 object-group id3CD87B1E.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id3CD87B1E.dst.net.0 object-group id3CD87B1E.srv.tcp.0 
 ! 
 ! Rule  17 (global)
-access-list outside_acl_in permit tcp any object-group outside.id3CD8770E.dst.net.0 object-group outside.id3CD87B1E.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id3CD8770E.dst.net.0 object-group outside.id3CD87B1E.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id3CD8770E.dst.net.0 object-group outside.id3CD87B1E.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id3CD8770E.dst.net.0 object-group id3CD87B1E.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3CD8770E.dst.net.0 object-group id3CD87B1E.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id3CD8770E.dst.net.0 object-group id3CD87B1E.srv.tcp.0 
 ! 
 ! Rule  18 (global)
-access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.pol-firewall2-4.srv.tcp.0 
-access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.pol-firewall2-4.srv.tcp.0 
-access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.pol-firewall2-4.srv.tcp.0 
+access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group pol-firewall2-4.srv.tcp.0 
+access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group pol-firewall2-4.srv.tcp.0 
+access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group pol-firewall2-4.srv.tcp.0 
 ! 
 ! Rule  19 (global)
 ! objects hostA and hostB are
diff --git a/test/pix/firewall1.fw.orig b/test/pix/firewall1.fw.orig
index a02a3cd81..b485f527c 100755
--- a/test/pix/firewall1.fw.orig
+++ b/test/pix/firewall1.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:41 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:17 2011 PST by vadim
 !
 ! Compiled for pix 6.1
 ! Outbound ACLs: not supported
@@ -68,7 +68,7 @@ floodguard disable
 
 !################
 
-object-group icmp-type outside.id3D50B022.srv.icmp.0
+object-group icmp-type id3D50B022.srv.icmp.0
   icmp-object 8
   icmp-object 11
 exit
@@ -85,16 +85,16 @@ access-list inside_acl_in permit ip 192.168.1.0 255.255.255.0 any
 ! Rule  4 (eth1)
 icmp permit any 8 outside
 icmp permit any 11 outside
-access-list outside_acl_in permit icmp any interface outside object-group outside.id3D50B022.srv.icmp.0 
+access-list outside_acl_in permit icmp any interface outside object-group id3D50B022.srv.icmp.0 
 ! 
 ! Rule  5 (eth1)
-access-list outside_acl_in permit icmp any any object-group outside.id3D50B022.srv.icmp.0 
+access-list outside_acl_in permit icmp any any object-group id3D50B022.srv.icmp.0 
 ! 
 ! Rule  6 (eth1,eth2)
-access-list outside_acl_in permit icmp any interface outside object-group outside.id3D50B022.srv.icmp.0 
+access-list outside_acl_in permit icmp any interface outside object-group id3D50B022.srv.icmp.0 
 icmp permit any 8 dmz
 icmp permit any 11 dmz
-access-list dmz_acl_in permit icmp any host 192.168.2.1 object-group outside.id3D50B022.srv.icmp.0 
+access-list dmz_acl_in permit icmp any host 192.168.2.1 object-group id3D50B022.srv.icmp.0 
 ! 
 ! Rule  9 (global)
 telnet 0.0.0.0 0.0.0.0 inside
diff --git a/test/pix/firewall10.fw.orig b/test/pix/firewall10.fw.orig
index a75d8bdaf..716045a20 100755
--- a/test/pix/firewall10.fw.orig
+++ b/test/pix/firewall10.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:42 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:18 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
@@ -94,12 +94,12 @@ fixup protocol sqlnet 1521
 
 !################
 
-object-group network inside.id3DB0FA90.dst.net.0
+object-group network id3DB0FA90.dst.net.0
   network-object host 211.11.11.11 
   network-object host 211.22.22.22 
 exit
 
-object-group service inside.id3DB0FA90.srv.tcp.0 tcp
+object-group service id3DB0FA90.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -109,41 +109,41 @@ object-group service inside.id3DB0FA90.srv.tcp.0 tcp
   port-object eq 143
 exit
 
-object-group icmp-type outside.id3DB0F9C7.srv.icmp.0
+object-group icmp-type id3DB0F9C7.srv.icmp.0
   icmp-object 11
   icmp-object 0
   icmp-object 3
 exit
 
-object-group service outside.id3DB0F9BD.srv.tcp.0 tcp
+object-group service id3DB0F9BD.srv.tcp.0 tcp
   port-object eq 3128
   port-object eq 70
   port-object eq 6667
   port-object eq 23
 exit
 
-object-group service outside.id3DB0F9BD.srv.udp.0 udp
+object-group service id3DB0F9BD.srv.udp.0 udp
   port-object eq 161
   port-object eq 53
 exit
 
-object-group network outside.id3DB0F9E6.dst.net.0
+object-group network id3DB0F9E6.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
 
-object-group network inside.id3DB10695.src.net.0
+object-group network id3DB10695.src.net.0
   network-object 192.168.1.0 255.255.255.0 
   network-object 192.168.10.0 255.255.255.0 
   network-object 192.168.20.0 255.255.255.0 
 exit
 
-object-group network dmz.id3DB10695.src.net.0
+object-group network id3DB10695.src.net.1
   network-object 192.168.2.0 255.255.255.0 
   network-object 192.168.3.0 255.255.255.0 
 exit
 
-object-group network outside.id3DB10695.dst.net.0
+object-group network id3DB10695.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.11 
   network-object host 192.168.1.12 
@@ -153,12 +153,12 @@ object-group network outside.id3DB10695.dst.net.0
   network-object host 192.168.1.20 
 exit
 
-object-group network outside.id3DB0F9F2.dst.net.0
+object-group network id3DB0F9F2.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id3DB0F9FC.dst.net.0
+object-group network id3DB0F9FC.dst.net.0
   network-object host 192.168.1.11 
   network-object host 192.168.1.12 
   network-object host 192.168.1.13 
@@ -166,7 +166,7 @@ object-group network outside.id3DB0F9FC.dst.net.0
   network-object host 192.168.1.15 
 exit
 
-object-group service outside.id3DB0F9FC.srv.tcp.0 tcp
+object-group service id3DB0F9FC.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -177,12 +177,12 @@ object-group service outside.id3DB0F9FC.srv.tcp.0 tcp
   port-object eq 3128
 exit
 
-object-group network outside.id3DB0FA07.dst.net.0
+object-group network id3DB0FA07.dst.net.0
   network-object 192.168.1.11 255.255.255.255 
   network-object 192.168.1.12 255.255.255.252 
 exit
 
-object-group service outside.id3DB0FA12.srv.tcp.0 tcp
+object-group service id3DB0FA12.srv.tcp.0 tcp
   port-object eq 3128
   port-object range 10000 11000
   port-object eq 6667
@@ -227,25 +227,25 @@ exit
 access-list inside_acl_in permit ip 192.168.1.0 255.255.255.0 any log 6 interval 300
 ! 
 ! Rule  5 (ethernet0)
-access-list inside_acl_in permit tcp any object-group inside.id3DB0FA90.dst.net.0 object-group inside.id3DB0FA90.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group inside.id3DB0FA90.dst.net.0 object-group inside.id3DB0FA90.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group inside.id3DB0FA90.dst.net.0 object-group inside.id3DB0FA90.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3DB0FA90.dst.net.0 object-group id3DB0FA90.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3DB0FA90.dst.net.0 object-group id3DB0FA90.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id3DB0FA90.dst.net.0 object-group id3DB0FA90.srv.tcp.0 
 ! 
 ! Rule  7 (global)
-access-list outside_acl_in permit icmp any host 192.168.1.10 object-group outside.id3DB0F9C7.srv.icmp.0 
-access-list inside_acl_in permit icmp any host 192.168.1.10 object-group outside.id3DB0F9C7.srv.icmp.0 
-access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group outside.id3DB0F9C7.srv.icmp.0 
+access-list outside_acl_in permit icmp any host 192.168.1.10 object-group id3DB0F9C7.srv.icmp.0 
+access-list inside_acl_in permit icmp any host 192.168.1.10 object-group id3DB0F9C7.srv.icmp.0 
+access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group id3DB0F9C7.srv.icmp.0 
 ! 
 ! Rule  8 (global)
 access-list outside_acl_in permit icmp any host 192.168.1.10 
 access-list inside_acl_in permit icmp any host 192.168.1.10 
 access-list dmz_acl_in permit icmp any host 192.168.1.10 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group outside.id3DB0F9BD.srv.tcp.0 
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group outside.id3DB0F9BD.srv.tcp.0 
-access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group outside.id3DB0F9BD.srv.tcp.0 
-access-list outside_acl_in permit udp any host 192.168.1.10 object-group outside.id3DB0F9BD.srv.udp.0 
-access-list inside_acl_in permit udp any host 192.168.1.10 object-group outside.id3DB0F9BD.srv.udp.0 
-access-list dmz_acl_in permit udp any host 192.168.1.10 object-group outside.id3DB0F9BD.srv.udp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id3DB0F9BD.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id3DB0F9BD.srv.tcp.0 
+access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group id3DB0F9BD.srv.tcp.0 
+access-list outside_acl_in permit udp any host 192.168.1.10 object-group id3DB0F9BD.srv.udp.0 
+access-list inside_acl_in permit udp any host 192.168.1.10 object-group id3DB0F9BD.srv.udp.0 
+access-list dmz_acl_in permit udp any host 192.168.1.10 object-group id3DB0F9BD.srv.udp.0 
 access-list outside_acl_in permit 47 any host 192.168.1.10 
 access-list inside_acl_in permit 47 any host 192.168.1.10 
 access-list dmz_acl_in permit 47 any host 192.168.1.10 
@@ -268,35 +268,35 @@ access-list inside_acl_in permit 50 any any log 6 interval 300
 access-list dmz_acl_in permit 50 any any log 6 interval 300
 ! 
 ! Rule  11 (global)
-access-list outside_acl_in permit ip object-group inside.id3DB0FA90.dst.net.0 object-group outside.id3DB0F9E6.dst.net.0 
+access-list outside_acl_in permit ip object-group id3DB0FA90.dst.net.0 object-group id3DB0F9E6.dst.net.0 
 ! 
 ! Rule  12 (global)
 access-list outside_acl_in permit ip 192.168.4.0 255.255.255.0 host 192.168.1.1 
-access-list inside_acl_in permit ip object-group inside.id3DB10695.src.net.0 host 192.168.1.1 
-access-list dmz_acl_in permit ip object-group dmz.id3DB10695.src.net.0 host 192.168.1.1 
-access-list outside_acl_in permit ip 192.168.4.0 255.255.255.0 object-group outside.id3DB10695.dst.net.0 
-access-list inside_acl_in permit ip object-group inside.id3DB10695.src.net.0 object-group outside.id3DB10695.dst.net.0 
-access-list dmz_acl_in permit ip object-group dmz.id3DB10695.src.net.0 object-group outside.id3DB10695.dst.net.0 
+access-list inside_acl_in permit ip object-group id3DB10695.src.net.0 host 192.168.1.1 
+access-list dmz_acl_in permit ip object-group id3DB10695.src.net.1 host 192.168.1.1 
+access-list outside_acl_in permit ip 192.168.4.0 255.255.255.0 object-group id3DB10695.dst.net.0 
+access-list inside_acl_in permit ip object-group id3DB10695.src.net.0 object-group id3DB10695.dst.net.0 
+access-list dmz_acl_in permit ip object-group id3DB10695.src.net.1 object-group id3DB10695.dst.net.0 
 ! 
 ! Rule  13 (global)
-access-list outside_acl_in permit tcp any object-group outside.id3DB0F9F2.dst.net.0 eq 3128 
-access-list inside_acl_in permit tcp any object-group outside.id3DB0F9F2.dst.net.0 eq 3128 
-access-list dmz_acl_in permit tcp any object-group outside.id3DB0F9F2.dst.net.0 eq 3128 
+access-list outside_acl_in permit tcp any object-group id3DB0F9F2.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp any object-group id3DB0F9F2.dst.net.0 eq 3128 
+access-list dmz_acl_in permit tcp any object-group id3DB0F9F2.dst.net.0 eq 3128 
 ! 
 ! Rule  14 (global)
-access-list outside_acl_in permit tcp any object-group outside.id3DB0F9FC.dst.net.0 object-group outside.id3DB0F9FC.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id3DB0F9FC.dst.net.0 object-group outside.id3DB0F9FC.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id3DB0F9FC.dst.net.0 object-group outside.id3DB0F9FC.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id3DB0F9FC.dst.net.0 object-group id3DB0F9FC.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3DB0F9FC.dst.net.0 object-group id3DB0F9FC.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id3DB0F9FC.dst.net.0 object-group id3DB0F9FC.srv.tcp.0 
 ! 
 ! Rule  15 (global)
-access-list outside_acl_in permit tcp any object-group outside.id3DB0FA07.dst.net.0 object-group outside.id3DB0F9FC.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id3DB0FA07.dst.net.0 object-group outside.id3DB0F9FC.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id3DB0FA07.dst.net.0 object-group outside.id3DB0F9FC.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id3DB0FA07.dst.net.0 object-group id3DB0F9FC.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id3DB0FA07.dst.net.0 object-group id3DB0F9FC.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id3DB0FA07.dst.net.0 object-group id3DB0F9FC.srv.tcp.0 
 ! 
 ! Rule  16 (global)
-access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id3DB0FA12.srv.tcp.0 
-access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id3DB0FA12.srv.tcp.0 
-access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id3DB0FA12.srv.tcp.0 
+access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id3DB0FA12.srv.tcp.0 
+access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id3DB0FA12.srv.tcp.0 
+access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id3DB0FA12.srv.tcp.0 
 ! 
 ! Rule  19 (global)
 ssh    0.0.0.0 0.0.0.0 outside
diff --git a/test/pix/firewall11.fw.orig b/test/pix/firewall11.fw.orig
index 31c35aa92..5480ab575 100755
--- a/test/pix/firewall11.fw.orig
+++ b/test/pix/firewall11.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:42 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:18 2011 PST by vadim
 !
 ! Compiled for pix 6.2
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall12.fw.orig b/test/pix/firewall12.fw.orig
index 64f38d671..ca4a1f952 100755
--- a/test/pix/firewall12.fw.orig
+++ b/test/pix/firewall12.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:43 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:19 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
@@ -90,7 +90,7 @@ fixup protocol icmp error
 
 !################
 
-object-group network outside.id3F8F95CD.dst.net.0
+object-group network id3F8F95CD.dst.net.0
   network-object host 192.0.2.20 
   network-object host 192.0.2.21 
   network-object host 192.0.2.23 
@@ -123,17 +123,17 @@ access-list outside_acl_in  remark this comment
 access-list outside_acl_in  remark consists of
 access-list outside_acl_in  remark 3 lines of text
 access-list outside_acl_in permit tcp any interface outside eq 80 
-access-list outside_acl_in permit tcp any object-group outside.id3F8F95CD.dst.net.0 eq 80 
+access-list outside_acl_in permit tcp any object-group id3F8F95CD.dst.net.0 eq 80 
 access-list inside_acl_in  remark 3 (global)
 access-list inside_acl_in  remark this comment
 access-list inside_acl_in  remark consists of
 access-list inside_acl_in  remark 3 lines of text
-access-list inside_acl_in permit tcp any object-group outside.id3F8F95CD.dst.net.0 eq 80 
+access-list inside_acl_in permit tcp any object-group id3F8F95CD.dst.net.0 eq 80 
 access-list dmz50_acl_in  remark 3 (global)
 access-list dmz50_acl_in  remark this comment
 access-list dmz50_acl_in  remark consists of
 access-list dmz50_acl_in  remark 3 lines of text
-access-list dmz50_acl_in permit tcp any object-group outside.id3F8F95CD.dst.net.0 eq 80 
+access-list dmz50_acl_in permit tcp any object-group id3F8F95CD.dst.net.0 eq 80 
 ! 
 ! Rule  4 (global)
 access-list outside_acl_in  remark 4 (global)
diff --git a/test/pix/firewall13.fw.orig b/test/pix/firewall13.fw.orig
index 0ca8b43df..f8ccd0a9b 100755
--- a/test/pix/firewall13.fw.orig
+++ b/test/pix/firewall13.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:43 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:19 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall14.fw.orig b/test/pix/firewall14.fw.orig
index b750ae0bb..542d57a3c 100755
--- a/test/pix/firewall14.fw.orig
+++ b/test/pix/firewall14.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:44 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:20 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall2.fw.orig b/test/pix/firewall2.fw.orig
index 6697fb78a..62d7437e9 100755
--- a/test/pix/firewall2.fw.orig
+++ b/test/pix/firewall2.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:44 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:20 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
@@ -68,12 +68,12 @@ clear object-group
 clear icmp
 clear telnet
 
-object-group service inside.id3D6EF08C.srv.tcp.0 tcp
+object-group service id3D6EF08C.srv.tcp.0 tcp
   port-object eq 80
   port-object eq 119
 exit
 
-object-group network inside.id3D8FCCDE.src.net.0
+object-group network id3D8FCCDE.src.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
@@ -90,17 +90,17 @@ access-list outside_acl_in deny   ip 192.168.1.0 255.255.255.0 any log 6 interva
 access-list inside_acl_in deny   ip 192.168.1.0 255.255.255.0 any log 6 interval 300
 ! 
 ! Rule  2 (global)
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D6EF08C.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id3D6EF08C.srv.tcp.0 
 access-list outside_acl_in permit tcp any host 22.22.22.22 eq 80 
 access-list outside_acl_in permit tcp any host 22.22.22.22 eq 119 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D6EF08C.srv.tcp.0 
-access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D6EF08C.srv.tcp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id3D6EF08C.srv.tcp.0 
+access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group id3D6EF08C.srv.tcp.0 
 ! 
 ! Rule  3 (global)
-access-list inside_acl_in permit ip object-group inside.id3D8FCCDE.src.net.0 host 200.200.200.200 
+access-list inside_acl_in permit ip object-group id3D8FCCDE.src.net.0 host 200.200.200.200 
 ! 
 ! Rule  4 (global)
-access-list outside_acl_in permit ip host 200.200.200.200 object-group inside.id3D8FCCDE.src.net.0 
+access-list outside_acl_in permit ip host 200.200.200.200 object-group id3D8FCCDE.src.net.0 
 ! 
 ! Rule  6 (global)
 access-list inside_acl_in deny   ip any any 
diff --git a/test/pix/firewall20.fw.orig b/test/pix/firewall20.fw.orig
index 264bcb86b..1f43946f4 100755
--- a/test/pix/firewall20.fw.orig
+++ b/test/pix/firewall20.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:45 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:21 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall21-1.fw.orig b/test/pix/firewall21-1.fw.orig
index 6fe213ebc..cc8a71f7f 100755
--- a/test/pix/firewall21-1.fw.orig
+++ b/test/pix/firewall21-1.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:45 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:21 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall21.fw.orig b/test/pix/firewall21.fw.orig
index ecb8018c9..01ebab7c3 100755
--- a/test/pix/firewall21.fw.orig
+++ b/test/pix/firewall21.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:45 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:21 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
diff --git a/test/pix/firewall22.fw.orig b/test/pix/firewall22.fw.orig
index bb088946d..c4e6cf430 100755
--- a/test/pix/firewall22.fw.orig
+++ b/test/pix/firewall22.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:46 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:21 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
diff --git a/test/pix/firewall3.fw.orig b/test/pix/firewall3.fw.orig
index 2940d475a..67c9bec45 100755
--- a/test/pix/firewall3.fw.orig
+++ b/test/pix/firewall3.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:46 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:22 2011 PST by vadim
 !
 ! Compiled for pix 6.2
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall33.fw.orig b/test/pix/firewall33.fw.orig
index dc29182dd..9cfe01f5f 100755
--- a/test/pix/firewall33.fw.orig
+++ b/test/pix/firewall33.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:47 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:22 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
@@ -67,7 +67,7 @@ floodguard disable
 
 !################
 
-object-group network outside.id43867C2418346.src.net.0
+object-group network id43867C2418346.src.net.0
   network-object host 157.166.224.25 
   network-object host 157.166.224.26 
   network-object host 157.166.226.25 
@@ -76,7 +76,7 @@ object-group network outside.id43867C2418346.src.net.0
   network-object host 157.166.255.19 
 exit
 
-object-group network outside.id438728A918346.dst.net.0
+object-group network id438728A918346.dst.net.0
   network-object host 74.125.224.16 
   network-object host 74.125.224.17 
   network-object host 74.125.224.18 
@@ -94,15 +94,15 @@ exit
 access-list outside_acl_in deny   ip 192.168.1.0 255.255.255.0 any 
 ! 
 ! Rule  1 (global)
-access-list outside_acl_in permit ip object-group outside.id43867C2418346.src.net.0 any 
+access-list outside_acl_in permit ip object-group id43867C2418346.src.net.0 any 
 ! 
 ! Rule  3 (global)
 ! firewall33:Policy:3: error: DNSName object "buildmaster (ct)" (compile time) can not resolve dns name "buildmaster" (AF_INET): Host or network 'buildmaster' not found; last error: Unknown error Using dummy address in test mode
 access-list outside_acl_in permit ip host 192.0.2.1 any 
 ! 
 ! Rule  5 (global)
-access-list outside_acl_in deny   ip any object-group outside.id43867C2418346.src.net.0 
-access-list inside_acl_in deny   ip any object-group outside.id43867C2418346.src.net.0 
+access-list outside_acl_in deny   ip any object-group id43867C2418346.src.net.0 
+access-list inside_acl_in deny   ip any object-group id43867C2418346.src.net.0 
 ! 
 ! Rule  7 (global)
 ! firewall33:Policy:7: error: DNSName object "buildmaster (ct)" (compile time) can not resolve dns name "buildmaster" (AF_INET): Host or network 'buildmaster' not found; last error: Unknown error Using dummy address in test mode
@@ -111,8 +111,8 @@ access-list outside_acl_in permit ip any host 192.0.2.1
 access-list inside_acl_in permit ip any host 192.0.2.1 
 ! 
 ! Rule  9 (global)
-access-list outside_acl_in permit ip any object-group outside.id438728A918346.dst.net.0 
-access-list inside_acl_in permit ip any object-group outside.id438728A918346.dst.net.0 
+access-list outside_acl_in permit ip any object-group id438728A918346.dst.net.0 
+access-list inside_acl_in permit ip any object-group id438728A918346.dst.net.0 
 ! 
 ! Rule  11 (global)
 access-list outside_acl_in deny   ip any any log 6 interval 300
diff --git a/test/pix/firewall34.fw.orig b/test/pix/firewall34.fw.orig
index 05dbbf769..30ab14345 100755
--- a/test/pix/firewall34.fw.orig
+++ b/test/pix/firewall34.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:47 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:23 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
@@ -62,7 +62,7 @@ floodguard disable
 
 !################
 
-object-group network outside.id16988X10208.dst.net.0
+object-group network id16988X10208.dst.net.0
   network-object 192.168.1.1 255.255.255.255 
   network-object 192.168.1.2 255.255.255.255 
   network-object 192.168.1.3 255.255.255.252 
@@ -70,7 +70,7 @@ object-group network outside.id16988X10208.dst.net.0
   network-object 192.168.1.201 255.255.255.255 
 exit
 
-object-group network outside.id4390C25825682.dst.net.0
+object-group network id4390C25825682.dst.net.0
   network-object 58.33.181.83 255.255.255.255 
   network-object 58.53.82.190 255.255.255.255 
   network-object 58.231.13.78 255.255.255.255 
@@ -125,7 +125,7 @@ object-group network outside.id4390C25825682.dst.net.0
   network-object 222.174.113.2 255.255.255.255 
 exit
 
-object-group network outside.id4388CFF8674.src.net.0
+object-group network id4388CFF8674.src.net.0
   network-object 58.33.181.83 255.255.255.255 
   network-object 58.53.82.190 255.255.255.255 
   network-object 58.231.13.78 255.255.255.255 
@@ -180,7 +180,7 @@ object-group network outside.id4388CFF8674.src.net.0
   network-object 222.174.113.2 255.255.255.255 
 exit
 
-object-group network outside.id21263X16880.src.net.0
+object-group network id21263X16880.src.net.0
   network-object 10.1.0.0 255.255.255.0 
   network-object 10.1.2.0 255.255.255.0 
   network-object 10.1.3.0 255.255.255.0 
@@ -190,8 +190,8 @@ exit
 ! Rule  0 (global)
 access-list outside_acl_in permit ip any 192.168.2.128 255.255.255.128 
 access-list inside_acl_in permit ip any 192.168.2.128 255.255.255.128 
-access-list outside_acl_in permit ip any object-group outside.id16988X10208.dst.net.0 
-access-list inside_acl_in permit ip any object-group outside.id16988X10208.dst.net.0 
+access-list outside_acl_in permit ip any object-group id16988X10208.dst.net.0 
+access-list inside_acl_in permit ip any object-group id16988X10208.dst.net.0 
 ! 
 ! Rule  1 (global)
 ! firewall34:Policy:1: error: File not found for Address Table: missing table (file_does_not_exist.tbl) Using dummy address in test mode
@@ -200,25 +200,25 @@ access-list outside_acl_in permit ip any 192.0.2.0 255.255.255.0
 access-list inside_acl_in permit ip any 192.0.2.0 255.255.255.0 
 ! 
 ! Rule  2 (global)
-access-list outside_acl_in deny   ip any object-group outside.id4390C25825682.dst.net.0 log 6 interval 300
-access-list inside_acl_in deny   ip any object-group outside.id4390C25825682.dst.net.0 log 6 interval 300
+access-list outside_acl_in deny   ip any object-group id4390C25825682.dst.net.0 log 6 interval 300
+access-list inside_acl_in deny   ip any object-group id4390C25825682.dst.net.0 log 6 interval 300
 ! 
 ! Rule  3 (global)
-access-list outside_acl_in deny   tcp any object-group outside.id4390C25825682.dst.net.0 eq 25 
-access-list inside_acl_in deny   tcp any object-group outside.id4390C25825682.dst.net.0 eq 25 
+access-list outside_acl_in deny   tcp any object-group id4390C25825682.dst.net.0 eq 25 
+access-list inside_acl_in deny   tcp any object-group id4390C25825682.dst.net.0 eq 25 
 ! 
 ! Rule  5 (global)
-access-list outside_acl_in deny   ip object-group outside.id4388CFF8674.src.net.0 any log 6 interval 300
+access-list outside_acl_in deny   ip object-group id4388CFF8674.src.net.0 any log 6 interval 300
 ! 
 ! Rule  6 (global)
-access-list outside_acl_in deny   ip object-group outside.id4390C25825682.dst.net.0 any log 6 interval 300
+access-list outside_acl_in deny   ip object-group id4390C25825682.dst.net.0 any log 6 interval 300
 ! 
 ! Rule  7 (global)
-access-list outside_acl_in permit ip object-group outside.id4390C25825682.dst.net.0 any 
+access-list outside_acl_in permit ip object-group id4390C25825682.dst.net.0 any 
 ! 
 ! Rule  8 (global)
 ! for #1917
-access-list outside_acl_in deny   ip object-group outside.id21263X16880.src.net.0 any 
+access-list outside_acl_in deny   ip object-group id21263X16880.src.net.0 any 
 ! 
 ! Rule  10 (global)
 access-list outside_acl_in permit tcp any host 192.168.1.10 eq 25 
diff --git a/test/pix/firewall4.fw.orig b/test/pix/firewall4.fw.orig
index a6fe86442..f97c451d7 100755
--- a/test/pix/firewall4.fw.orig
+++ b/test/pix/firewall4.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:48 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:23 2011 PST by vadim
 !
 ! Compiled for pix 6.2
 ! Outbound ACLs: not supported
@@ -80,12 +80,12 @@ clear object-group
 clear icmp
 clear telnet
 
-object-group service inside.id3D79A1C2.srv.tcp.0 tcp
+object-group service id3D79A1C2.srv.tcp.0 tcp
   port-object eq 22
   port-object eq 80
 exit
 
-object-group network inside.id3D79A1E4.dst.net.0
+object-group network id3D79A1E4.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
@@ -99,20 +99,20 @@ access-list outside_acl_in permit tcp any host 222.222.222.222 eq 22
 access-list outside_acl_in permit tcp any host 192.168.1.10 eq 22 
 ! 
 ! Rule  1 (global)
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D79A1C2.srv.tcp.0 
-access-list dmz1_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D79A1C2.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id3D79A1C2.srv.tcp.0 
+access-list dmz1_acl_in permit tcp any host 192.168.1.10 object-group id3D79A1C2.srv.tcp.0 
 access-list dmz2_acl_in permit tcp any host 192.168.2.1 eq 22 
-access-list dmz2_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D79A1C2.srv.tcp.0 
+access-list dmz2_acl_in permit tcp any host 192.168.1.10 object-group id3D79A1C2.srv.tcp.0 
 access-list outside_acl_in permit tcp any host 222.222.222.222 eq 22 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group inside.id3D79A1C2.srv.tcp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id3D79A1C2.srv.tcp.0 
 ! 
 ! Rule  2 (global)
-access-list inside_acl_in permit tcp any object-group inside.id3D79A1E4.dst.net.0 eq 22 
-access-list dmz1_acl_in permit tcp any object-group inside.id3D79A1E4.dst.net.0 eq 22 
+access-list inside_acl_in permit tcp any object-group id3D79A1E4.dst.net.0 eq 22 
+access-list dmz1_acl_in permit tcp any object-group id3D79A1E4.dst.net.0 eq 22 
 access-list dmz2_acl_in permit tcp any host 192.168.2.1 eq 22 
-access-list dmz2_acl_in permit tcp any object-group inside.id3D79A1E4.dst.net.0 eq 22 
+access-list dmz2_acl_in permit tcp any object-group id3D79A1E4.dst.net.0 eq 22 
 access-list outside_acl_in permit tcp any host 222.222.222.222 eq 22 
-access-list outside_acl_in permit tcp any object-group inside.id3D79A1E4.dst.net.0 eq 22 
+access-list outside_acl_in permit tcp any object-group id3D79A1E4.dst.net.0 eq 22 
 ! 
 ! Rule  3 (global)
 ! 'masquerading' rule
diff --git a/test/pix/firewall50.fw.orig b/test/pix/firewall50.fw.orig
index bb86fb2c6..36fc18778 100755
--- a/test/pix/firewall50.fw.orig
+++ b/test/pix/firewall50.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:48 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:24 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
@@ -129,12 +129,12 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group network inside.id45142FA628543.dst.net.0
+object-group network id45142FA628543.dst.net.0
   network-object host 211.11.11.11 
   network-object host 211.22.22.22 
 exit
 
-object-group service inside.id45142FA628543.srv.tcp.0 tcp
+object-group service id45142FA628543.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -144,40 +144,40 @@ object-group service inside.id45142FA628543.srv.tcp.0 tcp
   port-object eq 143
 exit
 
-object-group icmp-type outside.id45142FCB28543.srv.icmp.0
+object-group icmp-type id45142FCB28543.srv.icmp.0
   icmp-object 11
   icmp-object 0
   icmp-object 3
 exit
 
-object-group service outside.id45142FD728543.srv.tcp.0 tcp
+object-group service id45142FD728543.srv.tcp.0 tcp
   port-object eq 3128
   port-object eq 70
   port-object eq 6667
   port-object eq 23
 exit
 
-object-group service outside.id45142FD728543.srv.udp.0 udp
+object-group service id45142FD728543.srv.udp.0 udp
   port-object eq 161
   port-object eq 53
 exit
 
-object-group network outside.id45142FFC28543.dst.net.0
+object-group network id45142FFC28543.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
 
-object-group network inside.id4514300A28543.dst.net.0
+object-group network id4514300A28543.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id4514301628543.dst.net.0
+object-group network id4514301628543.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id4514302F28543.dst.net.0
+object-group network id4514302F28543.dst.net.0
   network-object host 192.168.1.11 
   network-object host 192.168.1.12 
   network-object host 192.168.1.13 
@@ -185,7 +185,7 @@ object-group network outside.id4514302F28543.dst.net.0
   network-object host 192.168.1.15 
 exit
 
-object-group service outside.id4514302F28543.srv.tcp.0 tcp
+object-group service id4514302F28543.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -196,12 +196,12 @@ object-group service outside.id4514302F28543.srv.tcp.0 tcp
   port-object eq 3128
 exit
 
-object-group network outside.id4514303C28543.dst.net.0
+object-group network id4514303C28543.dst.net.0
   network-object 192.168.1.11 255.255.255.255 
   network-object 192.168.1.12 255.255.255.252 
 exit
 
-object-group service outside.id4514304928543.srv.tcp.0 tcp
+object-group service id4514304928543.srv.tcp.0 tcp
   port-object eq 3128
   port-object range 10000 11000
   port-object eq 6667
@@ -254,9 +254,9 @@ access-list inside_acl_in permit ip 192.168.1.0 255.255.255.0 any log 0 interval
 ssh    192.168.1.0 255.255.255.0 inside
 ! 
 ! Rule  5 (ethernet0)
-access-list inside_acl_in permit tcp any object-group inside.id45142FA628543.dst.net.0 object-group inside.id45142FA628543.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group inside.id45142FA628543.dst.net.0 object-group inside.id45142FA628543.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group inside.id45142FA628543.dst.net.0 object-group inside.id45142FA628543.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id45142FA628543.dst.net.0 object-group id45142FA628543.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id45142FA628543.dst.net.0 object-group id45142FA628543.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id45142FA628543.dst.net.0 object-group id45142FA628543.srv.tcp.0 
 ! 
 ! Rule  6 (ethernet0)
 access-list inside_acl_in deny   ip any host 192.168.1.255 
@@ -270,20 +270,20 @@ access-list inside_acl_in permit tcp host 192.168.2.10 host 192.168.1.10 eq 22
 access-list dmz_acl_in permit tcp host 192.168.2.10 host 192.168.1.10 eq 22 
 ! 
 ! Rule  10 (global)
-access-list outside_acl_in permit icmp any host 192.168.1.10 object-group outside.id45142FCB28543.srv.icmp.0 
-access-list inside_acl_in permit icmp any host 192.168.1.10 object-group outside.id45142FCB28543.srv.icmp.0 
-access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group outside.id45142FCB28543.srv.icmp.0 
+access-list outside_acl_in permit icmp any host 192.168.1.10 object-group id45142FCB28543.srv.icmp.0 
+access-list inside_acl_in permit icmp any host 192.168.1.10 object-group id45142FCB28543.srv.icmp.0 
+access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group id45142FCB28543.srv.icmp.0 
 ! 
 ! Rule  11 (global)
 access-list outside_acl_in permit icmp any host 192.168.1.10 
 access-list inside_acl_in permit icmp any host 192.168.1.10 
 access-list dmz_acl_in permit icmp any host 192.168.1.10 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group outside.id45142FD728543.srv.tcp.0 
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group outside.id45142FD728543.srv.tcp.0 
-access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group outside.id45142FD728543.srv.tcp.0 
-access-list outside_acl_in permit udp any host 192.168.1.10 object-group outside.id45142FD728543.srv.udp.0 
-access-list inside_acl_in permit udp any host 192.168.1.10 object-group outside.id45142FD728543.srv.udp.0 
-access-list dmz_acl_in permit udp any host 192.168.1.10 object-group outside.id45142FD728543.srv.udp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id45142FD728543.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id45142FD728543.srv.tcp.0 
+access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group id45142FD728543.srv.tcp.0 
+access-list outside_acl_in permit udp any host 192.168.1.10 object-group id45142FD728543.srv.udp.0 
+access-list inside_acl_in permit udp any host 192.168.1.10 object-group id45142FD728543.srv.udp.0 
+access-list dmz_acl_in permit udp any host 192.168.1.10 object-group id45142FD728543.srv.udp.0 
 access-list outside_acl_in permit 47 any host 192.168.1.10 
 access-list inside_acl_in permit 47 any host 192.168.1.10 
 access-list dmz_acl_in permit 47 any host 192.168.1.10 
@@ -305,16 +305,16 @@ access-list inside_acl_in permit 50 any any log 0 interval 300
 access-list dmz_acl_in permit 50 any any log 0 interval 300
 ! 
 ! Rule  14 (global)
-access-list outside_acl_in permit ip object-group inside.id45142FA628543.dst.net.0 object-group outside.id45142FFC28543.dst.net.0 
+access-list outside_acl_in permit ip object-group id45142FA628543.dst.net.0 object-group id45142FFC28543.dst.net.0 
 ! 
 ! Rule  15 (global)
 ! firewall50:Policy:15: warning: MAC address matching is not supported. One or several MAC addresses removed from source in the rule
-access-list inside_acl_in permit tcp host 192.168.1.10 object-group inside.id4514300A28543.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp host 192.168.1.10 object-group id4514300A28543.dst.net.0 eq 3128 
 ! 
 ! Rule  16 (global)
-access-list outside_acl_in permit tcp any object-group outside.id4514301628543.dst.net.0 eq 3128 
-access-list inside_acl_in permit tcp any object-group outside.id4514301628543.dst.net.0 eq 3128 
-access-list dmz_acl_in permit tcp any object-group outside.id4514301628543.dst.net.0 eq 3128 
+access-list outside_acl_in permit tcp any object-group id4514301628543.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp any object-group id4514301628543.dst.net.0 eq 3128 
+access-list dmz_acl_in permit tcp any object-group id4514301628543.dst.net.0 eq 3128 
 ! 
 ! Rule  17 (global)
 ssh    0.0.0.0 0.0.0.0 outside
@@ -325,19 +325,19 @@ access-list inside_acl_in permit icmp any host 192.168.1.1 3
 access-list dmz_acl_in permit icmp any host 192.168.2.1 3 
 ! 
 ! Rule  18 (global)
-access-list outside_acl_in permit tcp any object-group outside.id4514302F28543.dst.net.0 object-group outside.id4514302F28543.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id4514302F28543.dst.net.0 object-group outside.id4514302F28543.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id4514302F28543.dst.net.0 object-group outside.id4514302F28543.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id4514302F28543.dst.net.0 object-group id4514302F28543.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id4514302F28543.dst.net.0 object-group id4514302F28543.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id4514302F28543.dst.net.0 object-group id4514302F28543.srv.tcp.0 
 ! 
 ! Rule  19 (global)
-access-list outside_acl_in permit tcp any object-group outside.id4514303C28543.dst.net.0 object-group outside.id4514302F28543.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id4514303C28543.dst.net.0 object-group outside.id4514302F28543.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id4514303C28543.dst.net.0 object-group outside.id4514302F28543.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id4514303C28543.dst.net.0 object-group id4514302F28543.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id4514303C28543.dst.net.0 object-group id4514302F28543.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id4514303C28543.dst.net.0 object-group id4514302F28543.srv.tcp.0 
 ! 
 ! Rule  20 (global)
-access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id4514304928543.srv.tcp.0 
-access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id4514304928543.srv.tcp.0 
-access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id4514304928543.srv.tcp.0 
+access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id4514304928543.srv.tcp.0 
+access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id4514304928543.srv.tcp.0 
+access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id4514304928543.srv.tcp.0 
 ! 
 ! Rule  21 (global)
 ! objects hostA and hostB are
diff --git a/test/pix/firewall6.fw.orig b/test/pix/firewall6.fw.orig
index 56ed7b2f1..4184594f3 100755
--- a/test/pix/firewall6.fw.orig
+++ b/test/pix/firewall6.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:48 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:24 2011 PST by vadim
 !
 ! Compiled for pix 6.2
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall8.fw.orig b/test/pix/firewall8.fw.orig
index 0c798917a..ee32812f3 100755
--- a/test/pix/firewall8.fw.orig
+++ b/test/pix/firewall8.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:49 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:25 2011 PST by vadim
 !
 ! Compiled for pix 6.2
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall80.fw.orig b/test/pix/firewall80.fw.orig
index c6d54e895..8b7ba2f33 100755
--- a/test/pix/firewall80.fw.orig
+++ b/test/pix/firewall80.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:49 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:25 2011 PST by vadim
 !
 ! Compiled for pix 8.2
 ! Outbound ACLs: supported
@@ -92,22 +92,22 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group icmp-type outside.id19186X29796.srv.icmp.0
+object-group icmp-type id19186X29796.srv.icmp.0
   icmp-object 8
   icmp-object 0
 exit
 
-object-group service outside.id19186X29796.srv.tcp.0 tcp
+object-group service id19186X29796.srv.tcp.0 tcp
   port-object eq 53
   port-object eq 25
 exit
 
-object-group service outside.id19186X29796.srv.udp.0 udp
+object-group service id19186X29796.srv.udp.0 udp
   port-object eq 123
   port-object eq 53
 exit
 
-object-group icmp-type inside.id21447X11252.srv.icmp.0
+object-group icmp-type id21447X11252.srv.icmp.0
   icmp-object 8
   icmp-object 3
 exit
@@ -127,12 +127,12 @@ icmp permit any 3  inside
 access-list inside_acl_in permit icmp any host 192.168.1.1 3 
 ! 
 ! Rule  4 (global)
-access-list outside_acl_in permit icmp any host 192.168.1.10 object-group outside.id19186X29796.srv.icmp.0 
-access-list inside_acl_in permit icmp any host 192.168.1.10 object-group outside.id19186X29796.srv.icmp.0 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group outside.id19186X29796.srv.tcp.0 
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group outside.id19186X29796.srv.tcp.0 
-access-list outside_acl_in permit udp any host 192.168.1.10 object-group outside.id19186X29796.srv.udp.0 
-access-list inside_acl_in permit udp any host 192.168.1.10 object-group outside.id19186X29796.srv.udp.0 
+access-list outside_acl_in permit icmp any host 192.168.1.10 object-group id19186X29796.srv.icmp.0 
+access-list inside_acl_in permit icmp any host 192.168.1.10 object-group id19186X29796.srv.icmp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id19186X29796.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id19186X29796.srv.tcp.0 
+access-list outside_acl_in permit udp any host 192.168.1.10 object-group id19186X29796.srv.udp.0 
+access-list inside_acl_in permit udp any host 192.168.1.10 object-group id19186X29796.srv.udp.0 
 access-list outside_acl_in permit 50 any host 192.168.1.10 
 access-list inside_acl_in permit 50 any host 192.168.1.10 
 access-list outside_acl_in permit 51 any host 192.168.1.10 
@@ -165,8 +165,8 @@ access-list inside_acl_in deny   tcp any host 192.168.1.10
 ! mixed services
 icmp permit 192.168.1.0 255.255.255.192 8 inside
 icmp permit 192.168.1.0 255.255.255.192 3 inside
-access-list inside_acl_in permit icmp 192.168.1.0 255.255.255.192 host 192.168.1.1 object-group inside.id21447X11252.srv.icmp.0 
-access-list inside_acl_in permit icmp 192.168.1.0 255.255.255.192 any object-group inside.id21447X11252.srv.icmp.0 
+access-list inside_acl_in permit icmp 192.168.1.0 255.255.255.192 host 192.168.1.1 object-group id21447X11252.srv.icmp.0 
+access-list inside_acl_in permit icmp 192.168.1.0 255.255.255.192 any object-group id21447X11252.srv.icmp.0 
 access-list inside_acl_in permit tcp 192.168.1.0 255.255.255.192 any eq 3128 
 access-list inside_acl_in permit udp 192.168.1.0 255.255.255.192 any eq 53 
 ! 
diff --git a/test/pix/firewall81.fw.orig b/test/pix/firewall81.fw.orig
index e8f633d8c..130246e02 100755
--- a/test/pix/firewall81.fw.orig
+++ b/test/pix/firewall81.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:21:33 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:25 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
diff --git a/test/pix/firewall82.fw.orig b/test/pix/firewall82.fw.orig
index 9201781e9..334372c13 100755
--- a/test/pix/firewall82.fw.orig
+++ b/test/pix/firewall82.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:50 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:26 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
diff --git a/test/pix/firewall83.fw.orig b/test/pix/firewall83.fw.orig
index 2ad2872e3..9c945b8c9 100755
--- a/test/pix/firewall83.fw.orig
+++ b/test/pix/firewall83.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:51 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:26 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
diff --git a/test/pix/firewall9.fw.orig b/test/pix/firewall9.fw.orig
index c42b4fae3..a0991bd86 100755
--- a/test/pix/firewall9.fw.orig
+++ b/test/pix/firewall9.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:51 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:27 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported
diff --git a/test/pix/firewall90.fw.orig b/test/pix/firewall90.fw.orig
index 5cd75d601..ed546f12f 100755
--- a/test/pix/firewall90.fw.orig
+++ b/test/pix/firewall90.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:51 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:27 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
@@ -174,13 +174,13 @@ clear config icmp
 clear config telnet
 
 
-object-group network outside.id78630X30274.src.net.0
+object-group network id78630X30274.src.net.0
   network-object 10.1.2.0 255.255.255.0 
   network-object 10.1.3.0 255.255.255.0 
 exit
 ! 
 ! Rule  0 (global)
-access-list outside_acl_in deny   ip object-group outside.id78630X30274.src.net.0 any 
+access-list outside_acl_in deny   ip object-group id78630X30274.src.net.0 any 
 ! 
 ! Rule  1 (global)
 ! for #1942
@@ -209,56 +209,56 @@ clear config nat
 clear config object
 
 
-object-group network outside.id178211X29963.osrc.net.0
+object-group network id178211X29963.osrc.net.0
   network-object object internal_subnet_1.0
   network-object object internal_subnet_2.0
 exit
 
-object-group network outside.id21353X4994.osrc.net.0
+object-group network id21353X4994.osrc.net.0
   network-object object internal_subnet_1.0
   network-object object Internal_net.0
   network-object object internal_subnet_2.0
 exit
 
-object-group network outside.id130599X29063.tsrc.net.0
+object-group network id130599X29063.tsrc.net.0
   network-object object outside_range.0
   network-object object firewall90:FastEthernet1:ip.0
   network-object object external_gw2.0
 exit
 
-object-group network outside.id20720X27505.tsrc.net.0
+object-group network id20720X27505.tsrc.net.0
   network-object object outside_range.0
   network-object object external_gw2.0
 exit
 
-object-group network outside.id241772X29764.tsrc.net.0
+object-group network id241772X29764.tsrc.net.0
   network-object object outside_range.0
 exit
 
-object-group network outside.id643092X27990.tsrc.net.0
+object-group network id643092X27990.tsrc.net.0
   network-object object ext_subnet.0
 exit
 
-object-group network outside.id21121X3710.tsrc.net.0
+object-group network id21121X3710.tsrc.net.0
   network-object object outside_range-1.0
   network-object object external_gw2.0
 exit
 
-object-group network outside.id21177X3720.tsrc.net.0
+object-group network id21177X3720.tsrc.net.0
   network-object object ext_subnet.0
 exit
 
-object-group network outside.id77971X5929.odst.net.0
+object-group network id77971X5929.odst.net.0
   network-object object spamhost1.0
   network-object object spamhost2.0
 exit
 
-object-group network outside.id77971X5929.tsrc.net.0
+object-group network id77971X5929.tsrc.net.0
   network-object object outside_range-1.0
   network-object object external_gw2.0
 exit
 
-object-group network outside.id77971X5929.tsrc.net.1
+object-group network id77971X5929.tsrc.net.1
   network-object object outside_range-1.0
   network-object object external_gw2.0
 exit
@@ -273,12 +273,12 @@ nat (inside,outside) source static hostA:eth0.0 firewall90:FastEthernet1:ip-1.0
 nat (inside,outside) source static hostA:eth0.0 interface service smtp.0 smtp.0 description "2 (NAT)"
 ! 
 ! Rule  3 (NAT)
-nat (inside,outside) source dynamic outside.id178211X29963.osrc.net.0 firewall90:FastEthernet1:ip-1.0 service smtp.0 smtp.0 description "3 (NAT)"
+nat (inside,outside) source dynamic id178211X29963.osrc.net.0 firewall90:FastEthernet1:ip-1.0 service smtp.0 smtp.0 description "3 (NAT)"
 ! 
 ! Rule  4 (NAT)
 ! for #1928
 ! note that group in OSrc includes another group
-nat (inside,outside) source dynamic outside.id21353X4994.osrc.net.0 firewall90:FastEthernet1:ip-1.0 service smtp.0 smtp.0 description "4 (NAT)"
+nat (inside,outside) source dynamic id21353X4994.osrc.net.0 firewall90:FastEthernet1:ip-1.0 service smtp.0 smtp.0 description "4 (NAT)"
 ! 
 ! Rule  5 (NAT)
 nat (inside,outside) source dynamic test_range_1.0 firewall90:FastEthernet1:ip-1.0 destination static spamhost1.0 spamhost1.0 service smtp.0 smtp.0 description "5 (NAT)"
@@ -288,15 +288,15 @@ nat (inside,outside) source static hostA:eth0.0 firewall90:FastEthernet1:ip-1.0
 ! 
 ! Rule  7 (NAT)
 ! For #1907
-nat (inside,outside) source dynamic hostA:eth0.0 outside.id130599X29063.tsrc.net.0 service smtp.0 smtp.0 description "7 (NAT)"
+nat (inside,outside) source dynamic hostA:eth0.0 id130599X29063.tsrc.net.0 service smtp.0 smtp.0 description "7 (NAT)"
 ! 
 ! Rule  8 (NAT)
 ! For #1907
-nat (inside,outside) source dynamic hostA:eth0.0 outside.id20720X27505.tsrc.net.0 interface service smtp.0 smtp.0 description "8 (NAT)"
+nat (inside,outside) source dynamic hostA:eth0.0 id20720X27505.tsrc.net.0 interface service smtp.0 smtp.0 description "8 (NAT)"
 ! 
 ! Rule  9 (NAT)
 ! For #1907
-nat (inside,outside) source dynamic hostA:eth0.0 outside.id241772X29764.tsrc.net.0 interface service smtp.0 smtp.0 description "9 (NAT)"
+nat (inside,outside) source dynamic hostA:eth0.0 id241772X29764.tsrc.net.0 interface service smtp.0 smtp.0 description "9 (NAT)"
 ! 
 ! Rule  10 (NAT)
 ! For #1907
@@ -304,7 +304,7 @@ nat (inside,outside) source static hostA:eth0.0 hostA:eth0.0 service smtp.0 smtp
 ! 
 ! Rule  11 (NAT)
 ! For #1907
-nat (inside,outside) source dynamic hostA:eth0.0 outside.id643092X27990.tsrc.net.0 interface service smtp.0 smtp.0 description "11 (NAT)"
+nat (inside,outside) source dynamic hostA:eth0.0 id643092X27990.tsrc.net.0 interface service smtp.0 smtp.0 description "11 (NAT)"
 ! 
 ! Rule  12 (NAT)
 ! for #1902
@@ -337,12 +337,12 @@ nat (inside,outside) source dynamic hostA:eth0.0 outside_range.0 description "16
 ! for #1885 "named object" - create 
 ! for #1907 "multiple objects in TSrc"
 ! network object to define address range, then add it to object-group
-nat (inside,outside) source dynamic hostA:eth0.0 outside.id21121X3710.tsrc.net.0 interface description "17 (NAT)"
+nat (inside,outside) source dynamic hostA:eth0.0 id21121X3710.tsrc.net.0 interface description "17 (NAT)"
 ! 
 ! Rule  18 (NAT)
 ! for #1908, #1916 "static" vs "dynamic"
 ! for #1907 "multiple objects in TSrc"
-nat (inside,outside) source dynamic hostA:eth0.0 outside.id21177X3720.tsrc.net.0 interface description "18 (NAT)"
+nat (inside,outside) source dynamic hostA:eth0.0 id21177X3720.tsrc.net.0 interface description "18 (NAT)"
 ! 
 ! Rule  19 (NAT)
 ! for #1908
@@ -365,8 +365,8 @@ nat (outside,inside) source static any any destination static interface hostA:et
 ! 
 ! Rule  23 (NAT)
 ! multiple objects in OSrc, ODst, OSrv and TSrc in various combinations
-nat (inside,outside) source dynamic outside.id178211X29963.osrc.net.0 outside.id77971X5929.tsrc.net.0 interface destination static outside.id77971X5929.odst.net.0 outside.id77971X5929.odst.net.0 service smtp.0 smtp.0 description "23 (NAT)"
-nat (inside,outside) source dynamic outside.id178211X29963.osrc.net.0 outside.id77971X5929.tsrc.net.1 interface destination static outside.id77971X5929.odst.net.0 outside.id77971X5929.odst.net.0 service smtps.0 smtps.0 description "23 (NAT)"
+nat (inside,outside) source dynamic id178211X29963.osrc.net.0 id77971X5929.tsrc.net.0 interface destination static id77971X5929.odst.net.0 id77971X5929.odst.net.0 service smtp.0 smtp.0 description "23 (NAT)"
+nat (inside,outside) source dynamic id178211X29963.osrc.net.0 id77971X5929.tsrc.net.1 interface destination static id77971X5929.odst.net.0 id77971X5929.odst.net.0 service smtps.0 smtps.0 description "23 (NAT)"
 ! 
 ! Rule  25 (NAT)
 ! for #1916
diff --git a/test/pix/firewall91.fw.orig b/test/pix/firewall91.fw.orig
index 954d8c47f..b24538339 100755
--- a/test/pix/firewall91.fw.orig
+++ b/test/pix/firewall91.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:52 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:27 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
diff --git a/test/pix/firewall92.fw.orig b/test/pix/firewall92.fw.orig
index 9da762b03..d94afc456 100755
--- a/test/pix/firewall92.fw.orig
+++ b/test/pix/firewall92.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:52 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:28 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
@@ -140,7 +140,7 @@ clear config nat
 clear config object
 
 
-object-group network outside.id20655X6113.osrc.net.0
+object-group network id20655X6113.osrc.net.0
   network-object object internal_subnet_1.0
   network-object object internal_subnet_2.0
 exit
@@ -155,7 +155,7 @@ nat (inside,outside) source static hostA:eth0.0 hostA:eth0.0 service smtp.0 smtp
 nat (inside,outside) source static hostA:eth0.0 hostA:eth0.0 destination static spamhost1.0 spamhost1.0 service smtp.0 smtp.0 description "2 (NAT)"
 ! 
 ! Rule  3 (NAT)
-nat (inside,outside) source static outside.id20655X6113.osrc.net.0 outside.id20655X6113.osrc.net.0 service smtp.0 smtp.0 description "3 (NAT)"
+nat (inside,outside) source static id20655X6113.osrc.net.0 id20655X6113.osrc.net.0 service smtp.0 smtp.0 description "3 (NAT)"
 ! 
 ! Rule  4 (NAT)
 nat (inside,outside) source static test_range_1.0 test_range_1.0 destination static spamhost1.0 spamhost1.0 service smtp.0 smtp.0 description "4 (NAT)"
diff --git a/test/pix/firewall93.fw.orig b/test/pix/firewall93.fw.orig
index 99e7af6eb..c5a403aee 100755
--- a/test/pix/firewall93.fw.orig
+++ b/test/pix/firewall93.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:52 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:28 2011 PST by vadim
 !
 ! Compiled for pix 8.3
 ! Outbound ACLs: supported
diff --git a/test/pix/fwsm1.fw.orig b/test/pix/fwsm1.fw.orig
index eb6987395..24614ce74 100755
--- a/test/pix/fwsm1.fw.orig
+++ b/test/pix/fwsm1.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:53 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:29 2011 PST by vadim
 !
 ! Compiled for fwsm 2.3
 ! Outbound ACLs: supported
@@ -113,12 +113,12 @@ clear object-group
 clear icmp
 clear telnet
 
-object-group network inside.id444A03DE9567.dst.net.0
+object-group network id444A03DE9567.dst.net.0
   network-object host 211.11.11.11 
   network-object host 211.22.22.22 
 exit
 
-object-group service inside.id444A03DE9567.srv.tcp.0 tcp
+object-group service id444A03DE9567.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -128,40 +128,40 @@ object-group service inside.id444A03DE9567.srv.tcp.0 tcp
   port-object eq 143
 exit
 
-object-group icmp-type outside.id444A04039567.srv.icmp.0
+object-group icmp-type id444A04039567.srv.icmp.0
   icmp-object 11
   icmp-object 0
   icmp-object 3
 exit
 
-object-group service outside.id444A040F9567.srv.tcp.0 tcp
+object-group service id444A040F9567.srv.tcp.0 tcp
   port-object eq 3128
   port-object eq 70
   port-object eq 6667
   port-object eq 23
 exit
 
-object-group service outside.id444A040F9567.srv.udp.0 udp
+object-group service id444A040F9567.srv.udp.0 udp
   port-object eq 161
   port-object eq 53
 exit
 
-object-group network outside.id444A04349567.dst.net.0
+object-group network id444A04349567.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
 
-object-group network inside.id444A04429567.dst.net.0
+object-group network id444A04429567.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id444A044E9567.dst.net.0
+object-group network id444A044E9567.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id444A04679567.dst.net.0
+object-group network id444A04679567.dst.net.0
   network-object host 192.168.1.11 
   network-object host 192.168.1.12 
   network-object host 192.168.1.13 
@@ -169,7 +169,7 @@ object-group network outside.id444A04679567.dst.net.0
   network-object host 192.168.1.15 
 exit
 
-object-group service outside.id444A04679567.srv.tcp.0 tcp
+object-group service id444A04679567.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -180,12 +180,12 @@ object-group service outside.id444A04679567.srv.tcp.0 tcp
   port-object eq 3128
 exit
 
-object-group network outside.id444A04749567.dst.net.0
+object-group network id444A04749567.dst.net.0
   network-object 192.168.1.11 255.255.255.255 
   network-object 192.168.1.12 255.255.255.252 
 exit
 
-object-group service outside.id444A04819567.srv.tcp.0 tcp
+object-group service id444A04819567.srv.tcp.0 tcp
   port-object eq 3128
   port-object range 10000 11000
   port-object eq 6667
@@ -238,28 +238,28 @@ access-list inside_acl_in permit ip 192.168.1.0 255.255.255.0 any log 0 interval
 ssh    192.168.1.0 255.255.255.0 inside
 ! 
 ! Rule  5 (ethernet0)
-access-list inside_acl_in permit tcp any object-group inside.id444A03DE9567.dst.net.0 object-group inside.id444A03DE9567.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group inside.id444A03DE9567.dst.net.0 object-group inside.id444A03DE9567.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group inside.id444A03DE9567.dst.net.0 object-group inside.id444A03DE9567.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id444A03DE9567.dst.net.0 object-group id444A03DE9567.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id444A03DE9567.dst.net.0 object-group id444A03DE9567.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id444A03DE9567.dst.net.0 object-group id444A03DE9567.srv.tcp.0 
 ! 
 ! Rule  6 (ethernet0)
 access-list inside_acl_in deny   ip any host 192.168.1.255 
 ! 
 ! Rule  8 (global)
-access-list outside_acl_in permit icmp any host 192.168.1.10 object-group outside.id444A04039567.srv.icmp.0 
-access-list inside_acl_in permit icmp any host 192.168.1.10 object-group outside.id444A04039567.srv.icmp.0 
-access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group outside.id444A04039567.srv.icmp.0 
+access-list outside_acl_in permit icmp any host 192.168.1.10 object-group id444A04039567.srv.icmp.0 
+access-list inside_acl_in permit icmp any host 192.168.1.10 object-group id444A04039567.srv.icmp.0 
+access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group id444A04039567.srv.icmp.0 
 ! 
 ! Rule  9 (global)
 access-list outside_acl_in permit icmp any host 192.168.1.10 
 access-list inside_acl_in permit icmp any host 192.168.1.10 
 access-list dmz_acl_in permit icmp any host 192.168.1.10 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group outside.id444A040F9567.srv.tcp.0 
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group outside.id444A040F9567.srv.tcp.0 
-access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group outside.id444A040F9567.srv.tcp.0 
-access-list outside_acl_in permit udp any host 192.168.1.10 object-group outside.id444A040F9567.srv.udp.0 
-access-list inside_acl_in permit udp any host 192.168.1.10 object-group outside.id444A040F9567.srv.udp.0 
-access-list dmz_acl_in permit udp any host 192.168.1.10 object-group outside.id444A040F9567.srv.udp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id444A040F9567.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id444A040F9567.srv.tcp.0 
+access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group id444A040F9567.srv.tcp.0 
+access-list outside_acl_in permit udp any host 192.168.1.10 object-group id444A040F9567.srv.udp.0 
+access-list inside_acl_in permit udp any host 192.168.1.10 object-group id444A040F9567.srv.udp.0 
+access-list dmz_acl_in permit udp any host 192.168.1.10 object-group id444A040F9567.srv.udp.0 
 access-list outside_acl_in permit 47 any host 192.168.1.10 
 access-list inside_acl_in permit 47 any host 192.168.1.10 
 access-list dmz_acl_in permit 47 any host 192.168.1.10 
@@ -281,16 +281,16 @@ access-list inside_acl_in permit 50 any any log 0 interval 300
 access-list dmz_acl_in permit 50 any any log 0 interval 300
 ! 
 ! Rule  12 (global)
-access-list outside_acl_in permit ip object-group inside.id444A03DE9567.dst.net.0 object-group outside.id444A04349567.dst.net.0 
+access-list outside_acl_in permit ip object-group id444A03DE9567.dst.net.0 object-group id444A04349567.dst.net.0 
 ! 
 ! Rule  13 (global)
 ! fwsm1:Policy:13: warning: MAC address matching is not supported. One or several MAC addresses removed from source in the rule
-access-list inside_acl_in permit tcp host 192.168.1.10 object-group inside.id444A04429567.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp host 192.168.1.10 object-group id444A04429567.dst.net.0 eq 3128 
 ! 
 ! Rule  14 (global)
-access-list outside_acl_in permit tcp any object-group outside.id444A044E9567.dst.net.0 eq 3128 
-access-list inside_acl_in permit tcp any object-group outside.id444A044E9567.dst.net.0 eq 3128 
-access-list dmz_acl_in permit tcp any object-group outside.id444A044E9567.dst.net.0 eq 3128 
+access-list outside_acl_in permit tcp any object-group id444A044E9567.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp any object-group id444A044E9567.dst.net.0 eq 3128 
+access-list dmz_acl_in permit tcp any object-group id444A044E9567.dst.net.0 eq 3128 
 ! 
 ! Rule  15 (global)
 ssh    0.0.0.0 0.0.0.0 outside
@@ -301,19 +301,19 @@ access-list inside_acl_in permit icmp any host 192.168.1.1 3
 access-list dmz_acl_in permit icmp any host 192.168.2.1 3 
 ! 
 ! Rule  16 (global)
-access-list outside_acl_in permit tcp any object-group outside.id444A04679567.dst.net.0 object-group outside.id444A04679567.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id444A04679567.dst.net.0 object-group outside.id444A04679567.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id444A04679567.dst.net.0 object-group outside.id444A04679567.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id444A04679567.dst.net.0 object-group id444A04679567.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id444A04679567.dst.net.0 object-group id444A04679567.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id444A04679567.dst.net.0 object-group id444A04679567.srv.tcp.0 
 ! 
 ! Rule  17 (global)
-access-list outside_acl_in permit tcp any object-group outside.id444A04749567.dst.net.0 object-group outside.id444A04679567.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id444A04749567.dst.net.0 object-group outside.id444A04679567.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id444A04749567.dst.net.0 object-group outside.id444A04679567.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id444A04749567.dst.net.0 object-group id444A04679567.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id444A04749567.dst.net.0 object-group id444A04679567.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id444A04749567.dst.net.0 object-group id444A04679567.srv.tcp.0 
 ! 
 ! Rule  18 (global)
-access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id444A04819567.srv.tcp.0 
-access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id444A04819567.srv.tcp.0 
-access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id444A04819567.srv.tcp.0 
+access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id444A04819567.srv.tcp.0 
+access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id444A04819567.srv.tcp.0 
+access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id444A04819567.srv.tcp.0 
 ! 
 ! Rule  19 (global)
 ! objects hostA and hostB are
diff --git a/test/pix/fwsm2.fw.orig b/test/pix/fwsm2.fw.orig
index d36231132..0ea622ae0 100755
--- a/test/pix/fwsm2.fw.orig
+++ b/test/pix/fwsm2.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:53 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:29 2011 PST by vadim
 !
 ! Compiled for fwsm 4.x
 ! Outbound ACLs: supported
@@ -124,12 +124,12 @@ clear config object-group
 clear config icmp
 clear config telnet
 
-object-group network inside.id17298X54624.dst.net.0
+object-group network id17298X54624.dst.net.0
   network-object host 211.11.11.11 
   network-object host 211.22.22.22 
 exit
 
-object-group service inside.id17298X54624.srv.tcp.0 tcp
+object-group service id17298X54624.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -139,40 +139,40 @@ object-group service inside.id17298X54624.srv.tcp.0 tcp
   port-object eq 143
 exit
 
-object-group icmp-type outside.id17335X54624.srv.icmp.0
+object-group icmp-type id17335X54624.srv.icmp.0
   icmp-object 11
   icmp-object 0
   icmp-object 3
 exit
 
-object-group service outside.id17347X54624.srv.tcp.0 tcp
+object-group service id17347X54624.srv.tcp.0 tcp
   port-object eq 3128
   port-object eq 70
   port-object eq 6667
   port-object eq 23
 exit
 
-object-group service outside.id17347X54624.srv.udp.0 udp
+object-group service id17347X54624.srv.udp.0 udp
   port-object eq 161
   port-object eq 53
 exit
 
-object-group network outside.id17384X54624.dst.net.0
+object-group network id17384X54624.dst.net.0
   network-object host 192.168.1.10 
   network-object host 192.168.1.20 
 exit
 
-object-group network inside.id17398X54624.dst.net.0
+object-group network id17398X54624.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id17410X54624.dst.net.0
+object-group network id17410X54624.dst.net.0
   network-object 192.168.1.250 255.255.255.254 
   network-object 192.168.1.252 255.255.255.252 
 exit
 
-object-group network outside.id17435X54624.dst.net.0
+object-group network id17435X54624.dst.net.0
   network-object host 192.168.1.11 
   network-object host 192.168.1.12 
   network-object host 192.168.1.13 
@@ -180,7 +180,7 @@ object-group network outside.id17435X54624.dst.net.0
   network-object host 192.168.1.15 
 exit
 
-object-group service outside.id17435X54624.srv.tcp.0 tcp
+object-group service id17435X54624.srv.tcp.0 tcp
   port-object eq 113
   port-object eq 80
   port-object eq 25
@@ -191,12 +191,12 @@ object-group service outside.id17435X54624.srv.tcp.0 tcp
   port-object eq 3128
 exit
 
-object-group network outside.id17448X54624.dst.net.0
+object-group network id17448X54624.dst.net.0
   network-object 192.168.1.11 255.255.255.255 
   network-object 192.168.1.12 255.255.255.252 
 exit
 
-object-group service outside.id17461X54624.srv.tcp.0 tcp
+object-group service id17461X54624.srv.tcp.0 tcp
   port-object eq 3128
   port-object range 10000 11000
   port-object eq 6667
@@ -249,28 +249,28 @@ access-list inside_acl_in permit ip 192.168.1.0 255.255.255.0 any log 0 interval
 ssh    192.168.1.0 255.255.255.0 inside
 ! 
 ! Rule  5 (ethernet0)
-access-list inside_acl_in permit tcp any object-group inside.id17298X54624.dst.net.0 object-group inside.id17298X54624.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group inside.id17298X54624.dst.net.0 object-group inside.id17298X54624.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group inside.id17298X54624.dst.net.0 object-group inside.id17298X54624.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id17298X54624.dst.net.0 object-group id17298X54624.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id17298X54624.dst.net.0 object-group id17298X54624.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id17298X54624.dst.net.0 object-group id17298X54624.srv.tcp.0 
 ! 
 ! Rule  6 (ethernet0)
 access-list inside_acl_in deny   ip any host 192.168.1.255 
 ! 
 ! Rule  8 (global)
-access-list outside_acl_in permit icmp any host 192.168.1.10 object-group outside.id17335X54624.srv.icmp.0 
-access-list inside_acl_in permit icmp any host 192.168.1.10 object-group outside.id17335X54624.srv.icmp.0 
-access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group outside.id17335X54624.srv.icmp.0 
+access-list outside_acl_in permit icmp any host 192.168.1.10 object-group id17335X54624.srv.icmp.0 
+access-list inside_acl_in permit icmp any host 192.168.1.10 object-group id17335X54624.srv.icmp.0 
+access-list dmz_acl_in permit icmp any host 192.168.1.10 object-group id17335X54624.srv.icmp.0 
 ! 
 ! Rule  9 (global)
 access-list outside_acl_in permit icmp any host 192.168.1.10 
 access-list inside_acl_in permit icmp any host 192.168.1.10 
 access-list dmz_acl_in permit icmp any host 192.168.1.10 
-access-list outside_acl_in permit tcp any host 192.168.1.10 object-group outside.id17347X54624.srv.tcp.0 
-access-list inside_acl_in permit tcp any host 192.168.1.10 object-group outside.id17347X54624.srv.tcp.0 
-access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group outside.id17347X54624.srv.tcp.0 
-access-list outside_acl_in permit udp any host 192.168.1.10 object-group outside.id17347X54624.srv.udp.0 
-access-list inside_acl_in permit udp any host 192.168.1.10 object-group outside.id17347X54624.srv.udp.0 
-access-list dmz_acl_in permit udp any host 192.168.1.10 object-group outside.id17347X54624.srv.udp.0 
+access-list outside_acl_in permit tcp any host 192.168.1.10 object-group id17347X54624.srv.tcp.0 
+access-list inside_acl_in permit tcp any host 192.168.1.10 object-group id17347X54624.srv.tcp.0 
+access-list dmz_acl_in permit tcp any host 192.168.1.10 object-group id17347X54624.srv.tcp.0 
+access-list outside_acl_in permit udp any host 192.168.1.10 object-group id17347X54624.srv.udp.0 
+access-list inside_acl_in permit udp any host 192.168.1.10 object-group id17347X54624.srv.udp.0 
+access-list dmz_acl_in permit udp any host 192.168.1.10 object-group id17347X54624.srv.udp.0 
 access-list outside_acl_in permit 47 any host 192.168.1.10 
 access-list inside_acl_in permit 47 any host 192.168.1.10 
 access-list dmz_acl_in permit 47 any host 192.168.1.10 
@@ -292,16 +292,16 @@ access-list inside_acl_in permit 50 any any log 0 interval 300
 access-list dmz_acl_in permit 50 any any log 0 interval 300
 ! 
 ! Rule  12 (global)
-access-list outside_acl_in permit ip object-group inside.id17298X54624.dst.net.0 object-group outside.id17384X54624.dst.net.0 
+access-list outside_acl_in permit ip object-group id17298X54624.dst.net.0 object-group id17384X54624.dst.net.0 
 ! 
 ! Rule  13 (global)
 ! fwsm2:Policy:13: warning: MAC address matching is not supported. One or several MAC addresses removed from source in the rule
-access-list inside_acl_in permit tcp host 192.168.1.10 object-group inside.id17398X54624.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp host 192.168.1.10 object-group id17398X54624.dst.net.0 eq 3128 
 ! 
 ! Rule  14 (global)
-access-list outside_acl_in permit tcp any object-group outside.id17410X54624.dst.net.0 eq 3128 
-access-list inside_acl_in permit tcp any object-group outside.id17410X54624.dst.net.0 eq 3128 
-access-list dmz_acl_in permit tcp any object-group outside.id17410X54624.dst.net.0 eq 3128 
+access-list outside_acl_in permit tcp any object-group id17410X54624.dst.net.0 eq 3128 
+access-list inside_acl_in permit tcp any object-group id17410X54624.dst.net.0 eq 3128 
+access-list dmz_acl_in permit tcp any object-group id17410X54624.dst.net.0 eq 3128 
 ! 
 ! Rule  15 (global)
 ssh    0.0.0.0 0.0.0.0 outside
@@ -312,19 +312,19 @@ access-list inside_acl_in permit icmp any host 192.168.1.1 3
 access-list dmz_acl_in permit icmp any host 192.168.2.1 3 
 ! 
 ! Rule  16 (global)
-access-list outside_acl_in permit tcp any object-group outside.id17435X54624.dst.net.0 object-group outside.id17435X54624.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id17435X54624.dst.net.0 object-group outside.id17435X54624.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id17435X54624.dst.net.0 object-group outside.id17435X54624.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id17435X54624.dst.net.0 object-group id17435X54624.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id17435X54624.dst.net.0 object-group id17435X54624.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id17435X54624.dst.net.0 object-group id17435X54624.srv.tcp.0 
 ! 
 ! Rule  17 (global)
-access-list outside_acl_in permit tcp any object-group outside.id17448X54624.dst.net.0 object-group outside.id17435X54624.srv.tcp.0 
-access-list inside_acl_in permit tcp any object-group outside.id17448X54624.dst.net.0 object-group outside.id17435X54624.srv.tcp.0 
-access-list dmz_acl_in permit tcp any object-group outside.id17448X54624.dst.net.0 object-group outside.id17435X54624.srv.tcp.0 
+access-list outside_acl_in permit tcp any object-group id17448X54624.dst.net.0 object-group id17435X54624.srv.tcp.0 
+access-list inside_acl_in permit tcp any object-group id17448X54624.dst.net.0 object-group id17435X54624.srv.tcp.0 
+access-list dmz_acl_in permit tcp any object-group id17448X54624.dst.net.0 object-group id17435X54624.srv.tcp.0 
 ! 
 ! Rule  18 (global)
-access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id17461X54624.srv.tcp.0 
-access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id17461X54624.srv.tcp.0 
-access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group outside.id17461X54624.srv.tcp.0 
+access-list outside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id17461X54624.srv.tcp.0 
+access-list inside_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id17461X54624.srv.tcp.0 
+access-list dmz_acl_in permit tcp any 192.168.1.0 255.255.255.0 object-group id17461X54624.srv.tcp.0 
 ! 
 ! Rule  19 (global)
 ! objects hostA and hostB are
diff --git a/test/pix/pix515.fw.orig b/test/pix/pix515.fw.orig
index ad1d4f38e..b1a08b223 100755
--- a/test/pix/pix515.fw.orig
+++ b/test/pix/pix515.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:54 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:30 2011 PST by vadim
 !
 ! Compiled for pix 7.0
 ! Outbound ACLs: supported
diff --git a/test/pix/real.fw.orig b/test/pix/real.fw.orig
index 8d9352041..13d61f116 100755
--- a/test/pix/real.fw.orig
+++ b/test/pix/real.fw.orig
@@ -1,9 +1,9 @@
 !
 !  This is automatically generated file. DO NOT MODIFY !
 !
-!  Firewall Builder  fwb_pix v4.2.0.3439
+!  Firewall Builder  fwb_pix v4.2.0.3440
 !
-!  Generated Wed Jan 19 20:15:54 2011 PST by vadim
+!  Generated Thu Jan 20 09:48:30 2011 PST by vadim
 !
 ! Compiled for pix 6.3
 ! Outbound ACLs: not supported