ubuntu 7.04, vmware, kernel name

[jack]

I installed ubuntu server 7.04 and vmware-server.  After running the
patch and building the vmmon, i upgraded the kernel 2.6.20-16 ...
The initial install of the kernel is named linux-2.6.20-15-server , and
the linux-headers match that name.  When I originally setup vmware, it
had no complaints.  After the kernel upgrade, I now have the kernel as
linux-2.6.20-16-server , but the linux headers are named
linux-headers-2.6.20-16 .  When trying to compile the vmmon,
vmware-config asks for the C header files directory, and when I tell it
the name of the directory, it complains with
 "The directory of kernel headers (version 2.6.20-16) does not match
your running kernel (version 2.6.20-16-server).  Even if the module were
to compile successfully, it would not load into the running kernel."

I'm sure someone has seen this before.  I'm wondering if I could rename
the /usr/src/linux-headers-2.6.20-16
to /usr/src/linux-headers-2.6.20-16-server , or maybe setup a link
of /usr/src/linux-headers-2.6.20-16 to /usr/src/linux

Other suggestions are also welcome.  I need this one working...