diff --git a/tasks/c-dev b/tasks/c-dev
index 275f67c0..9499fd1d 100644
--- a/tasks/c-dev
+++ b/tasks/c-dev
@@ -1,6 +1,6 @@
 Task: c-dev
 Section: devel
-Description: development in C and C++
+Description: C and C++
  A complete environment for development of programs in the C and C++ 
  programming languages, including:
   o Tools common for C, C++ and Objective C development
diff --git a/tasks/dialup b/tasks/dialup
index f838d4cf..2244a80a 100644
--- a/tasks/dialup
+++ b/tasks/dialup
@@ -1,6 +1,6 @@
 Task: dialup
-Section: hware
-Description: dialup utilities
+Section: user
+Description: dialup system
  This task selects packages that address special needs of computers
  using a part-time dialup connection (by modem, ISDN, ADSL, or cable).
 Packages:
diff --git a/tasks/file-server b/tasks/file-server
index 9dd778fb..1777cd2e 100644
--- a/tasks/file-server
+++ b/tasks/file-server
@@ -1,6 +1,6 @@
 Task: file-server
 Section: server
-Description: File server
+Description: file server
  This task sets up your system to be a file server. It includes
  the samba server for Windows, OS/2, or DOS clients, netatalk for Apple
  clients, and a NFS server.
diff --git a/tasks/fortran-dev b/tasks/fortran-dev
index 852b0543..a6edc96b 100644
--- a/tasks/fortran-dev
+++ b/tasks/fortran-dev
@@ -1,6 +1,6 @@
 Task: fortran-dev
 Section: devel
-Description: Fortran development environment
+Description: Fortran development
  This task provides a reasonably complete environment for Fortran 77
  development.
 Packages:
diff --git a/tasks/laptop b/tasks/laptop
index 02c5eff6..18d3dea0 100644
--- a/tasks/laptop
+++ b/tasks/laptop
@@ -1,5 +1,5 @@
 Task: laptop
-Section: hware
+Section: user
 Description: laptop system
  This is a collection of tools that laptop users will expect to find on a
  system.
diff --git a/tasks/python-dev b/tasks/python-dev
index bc23296e..73f6bcae 100644
--- a/tasks/python-dev
+++ b/tasks/python-dev
@@ -1,6 +1,6 @@
 Task: python-dev
 Section: devel
-Description: Python development
+Description: Python
  Almost all of the Debian-packaged Python tools
  and extensions, for developing scripts and simple or complex applications
  in Python.
diff --git a/tasks/tcltk-dev b/tasks/tcltk-dev
index c318f528..9251e80f 100644
--- a/tasks/tcltk-dev
+++ b/tasks/tcltk-dev
@@ -1,6 +1,6 @@
 Task: tcltk-dev
 Section: devel
-Description: developing Tcl/Tk applications
+Description: Tcl/Tk
  Packages commonly used in developing applications using the Tcl language
  and Tk Toolkit. It includes:
   o Script-level manpages