diff -Nurp drakx-installer-stage2-12.33.orig5/perl-install/install/any.pm drakx-installer-stage2-12.33/perl-install/install/any.pm
--- drakx-installer-stage2-12.33.orig5/perl-install/install/any.pm	2009-04-21 15:53:11.000000000 +0300
+++ drakx-installer-stage2-12.33/perl-install/install/any.pm	2009-08-31 22:31:23.095104114 +0300
@@ -344,8 +344,8 @@ sub setPackages {
 	my $kernel_pkg = install::pkgs::bestKernelPackage($o->{packages}, $o->{match_all_hardware});
 	install::pkgs::selectPackage($o->{packages}, $kernel_pkg, 1);
 	if ($o->{isUpgrade} && $o->{packages}{sizes}{dkms}) {
-	    log::l("selecting kernel-desktop-devel-latest (since dkms was installed)");
-	    install::pkgs::select_by_package_names($o->{packages}, ['kernel-desktop-devel-latest'], 1);
+	    log::l("selecting kernel-tmb-desktop-devel-latest (since dkms was installed)");
+	    install::pkgs::select_by_package_names($o->{packages}, ['kernel-tmb-desktop-devel-latest'], 1);
 	}
 
 	install::pkgs::select_by_package_names_or_die($o->{packages}, ['basesystem'], 1);
diff -Nurp drakx-installer-stage2-12.33.orig5/perl-install/install/pkgs.pm drakx-installer-stage2-12.33/perl-install/install/pkgs.pm
--- drakx-installer-stage2-12.33.orig5/perl-install/install/pkgs.pm	2009-04-22 17:26:55.000000000 +0300
+++ drakx-installer-stage2-12.33/perl-install/install/pkgs.pm	2009-08-31 22:31:23.095104114 +0300
@@ -167,22 +167,22 @@ sub _packageCallbackChoices_ {
     if (@$prefer) {
 	@$prefer;
     } elsif ($virtual_pkg_name eq 'kernel') {
-	my $re = join('|', map { "kernel\Q$_-2" } _bestKernel_extensions());
+	my $re = join('|', map { "kernel-tmb\Q$_-2" } _bestKernel_extensions());
 	my @l = grep { $_->name =~ $re } @$choices;
 	log::l("packageCallbackChoices: kernel chosen ", join(",", map { $_->name } @l), " in ", join(",", map { $_->name } @$choices));
 	@l;
-    } elsif ($choices->[0]->name =~ /^kernel-(.*source-|.*-devel-)/) {
+    } elsif ($choices->[0]->name =~ /^kernel-tmb-(.*source-|.*-devel-)/) {
 	my @l = grep {
-	    if ($_->name =~ /^kernel-.*source-stripped-(.*)/) {
+	    if ($_->name =~ /^kernel-tmb-.*source-stripped-(.*)/) {
 		my $version = quotemeta($1);
 		find {
 		    $_->name =~ /-$version$/ && ($_->flag_installed || $_->flag_selected);
 		} $urpm->packages_providing('kernel');
-	    } elsif ($_->name =~ /(kernel-.*)-devel-(.*)/) {
+	    } elsif ($_->name =~ /(kernel-tmb-.*)-devel-(.*)/) {
 		my $kernel = "$1-$2";
 		my $p = packageByName($urpm, $kernel);
 		$p && ($p->flag_installed || $p->flag_selected);
-	    } elsif ($_->name =~ /^kernel-.*source-/) {
+	    } elsif ($_->name =~ /^kernel-tmb-.*source-/) {
 		#- hopefully we don't have a media with kernel-source but not kernel-source-stripped nor kernel-.*-devel
 		0;
 	    } else {
diff -Nurp drakx-installer-stage2-12.33.orig5/perl-install/install/share/meta-task/rpmsrate-raw drakx-installer-stage2-12.33/perl-install/install/share/meta-task/rpmsrate-raw
--- drakx-installer-stage2-12.33.orig5/perl-install/install/share/meta-task/rpmsrate-raw	2009-08-31 22:27:22.000000000 +0300
+++ drakx-installer-stage2-12.33/perl-install/install/share/meta-task/rpmsrate-raw	2009-08-31 22:31:23.095104114 +0300
@@ -501,7 +501,7 @@ CAT_DEVELOPMENT
 
   4 rpm-build
   3 rpmlint rpm-rebuilder
-  3 kernel-source
+  3 kernel-tmb-source
 
   2 gcc-gfortran nasm dev86 
   1 gcc-objc
@@ -518,7 +518,7 @@ CAT_DEVELOPMENT
 
   CAT_BOOKS
     5 qt4-examples qt4-doc
-    2 pam-doc python-docs slang-doc kernel-doc nasm-doc ruby-doc lkmpg
+    2 pam-doc python-docs slang-doc kernel-tmb-doc nasm-doc ruby-doc lkmpg
 
   CAT_KDE
     5 kdevelop
@@ -676,7 +676,7 @@ CAT_SYSTEM
   5 drakstats
 
   5 HIGH_SECURITY lads
-  5 BIGMEM kernel-server-latest
+  5 BIGMEM kernel-tmb-server-latest
   
   5 PCMCIA pcmciautils
 
@@ -823,7 +823,7 @@ LIVE
 
 INSTALL
   NOCOPY
-    5 kernel-desktop-latest kernel-desktop586-latest kernel-server-latest
+    5 kernel-tmb-desktop-latest kernel-tmb-desktop586-latest kernel-tmb-server-latest
       mdadm lvm2 reiserfsprogs jfsutils xfsprogs quota dosfstools
       alsa-utils aoss task-x11
       ik8utils toshutils