--- a/ciena.grammar	Fri Nov 06 11:54:05 2009 +0100
+++ b/ciena.grammar	Fri Nov 06 12:33:41 2009 +0100
@@ -5,7 +5,7 @@
 
 $::res = {};
 $::res->{port} ={};
-$::res->{sub_port} ={};
+$::res->{"sub-port"} ={};
 $::res->{pm} = {
 	instance => {},
 	service => {},
@@ -128,7 +128,7 @@
 l_sub_port:	"sub-port" /add|create/ "sub-port" identifier avls
 		{
 		$avl->{action} = $item[2];
-		consume_avl("sub_port", $item{identifier}); 
+		consume_avl("sub-port", $item{identifier}); 
 		}
 
 # PM
@@ -165,7 +165,7 @@
 		$::res->{"pbt-tunnel"}->{$item{identifier}}->{type} = $item[2];
 		consume_avl("pbt-tunnel", $item{identifier})
 		}
-		| "pbt" "remote-bridge" "create" "bridge-name" identifier avls
+		| "pbt" "remote-bridge" "create" /bridge(-name)?/ identifier avls
 		{
 		$::res->{pbt}->{'remote-bridge'}->{$item{identifier}} = {};
 		consume_avl_ptr($::res->{pbt}->{'remote-bridge'}, $item{identifier})