asterisk users - Sep 2005 - CVS-HEAD and Caller ID -- Pulling my hair out!

I have looked into this callerid problem now for a few hours.

1) Caller id on a sipura-2000 now shows:

cidname
2000

Where cidname is the new outputted formate from the cid_rewrite agi script
and 2000 is the exten number.

In looking at the Dial() application,

option "o"
      'o' -- Original (inbound) Caller*ID should be placed on the
outbound
leg of the call
             instead of using the destination extension (old style
asterisk behavior)

I tried using this in my Dial string as an option but it wouldn't work, i
was getting the same Information..

Before I would have

Ben Cell
1234567890

appear on the sipura-2000 attached telephone.

The only thing i can get now is just

1234567890
2000 to appear on the phone

And when I try to use the new function set(CallerId(Name)="name") it
says
that that function is not registered..

However when I use the SetCidName and SetCidNum i get this:

Sep 22 21:15:03 WARNING[25515]: app_setcidnum.c:72 setcallerid_exec:
SetCIDNum is deprecated, please use Set(CALLERID(number)=value) instead.
    -- Executing SetCIDName("IAX2/66.234.228.170:4569-2",
"xxxxxxxxxx") in
new stack
Sep 22 21:15:03 WARNING[25515]: app_setcidname.c:70 setcallerid_exec:
SetCIDName is deprecated, please use Set(CALLERID(name)=value) instead.


ARGH!!!!!  it's a never ending Circle....