Long term fix should be to ask Lincoln to take the -pm out of the distribution name.
I've got to disagree with you there.
Why should the distribution name have any impact upon testers site? It exposes a flaw in your scheme, but it worked before, it should continue working.
Actually it didn't work before (try http://cpantesters.perl.org/show/CGI-pm.html#CGI.pm-3.42). There have been all sorts of problems because CGI.pm has been named differently from all the other distributions. CGI.pm is the exception to the rule everybody else uses :)