TS License issue after the upgrade to Windows 2008 R2

Hi

My Setup is as follows

Domain controller running on Windows 2003 R2
Terminal Server/ TS License/ TS Gateway/ TS Web Access running on Windows 2008 - 64 Bit

Everything was working fine. Recently I have upgraded the Terminal Server to Windows 2008 R2. All "Terminal Services" changed to "Remote Desktop Services" and everything works fine excep RD license. Soon after the upgrade I notice that RD license turned out to 120 Days trial licence as it could not find the RD license server. I checked that the services and other general things are fine. Before the upgrade I had 5 Nos. of TS PU CAL insatlled  and it was working fine. Now after the upgrade I can see the following alert under the Remote Desktop Session Host Configuration tool - Licensing Diagonosis

"The Remote Desktop Session Host server is within its grace period, but the RD Session Host server has not been configured with any license server."

And there is no server listed under RD license server information page:

Also everything seems to be perfect when I look at the RD licensing Manager. It shows 5 Nos of PU CAL is installed and it shows the same server as license server.

 Any idea what is going wrong?

Thanks in advance
Prakash