KPortagemaster renamed, now what?

[Lion]

I have noticed that kportagemaster has been renamed to kportage.

Now I have the following problem: after emerging the new kportage, kportagemaster is still registered as installed (qpkg -I -nc), and I am not able to remove the old version any more, because the ebuilds have gone.

UPDATE: This problem is not only with kportagemaster.
xscreensaver has been moved from app-misc to x11-misc.
This gives similar problems.
Apparently, portage is not very good at handling changing package names.

What can I do?