diff --git a/collects/algol60/info.ss b/collects/algol60/info.ss
index 6f744b1167..8cc1560f51 100644
--- a/collects/algol60/info.ss
+++ b/collects/algol60/info.ss
@@ -1,6 +1,6 @@
 #lang setup/infotab
 
-(define name "Algol 60")
+(define name "Algol 60 Language")
 (define tools '(("tool.ss")))
 (define tool-names '("Algol 60"))
 (define scribblings '(("algol60.scrbl")))
diff --git a/collects/browser/info.ss b/collects/browser/info.ss
index 6fc66dc9bc..c59e764b21 100644
--- a/collects/browser/info.ss
+++ b/collects/browser/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Browser")
 (define tools (list (list "tool.ss")))
 (define tool-names (list "Browser"))
 (define scribblings '(("browser.scrbl")))
diff --git a/collects/browser/private/info.ss b/collects/browser/private/info.ss
index 5f826c28f4..c14a2ca411 100644
--- a/collects/browser/private/info.ss
+++ b/collects/browser/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Browser private")
diff --git a/collects/combinator-parser/info.ss b/collects/combinator-parser/info.ss
index ed9cf79bf0..c14a2ca411 100644
--- a/collects/combinator-parser/info.ss
+++ b/collects/combinator-parser/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Combinator parser")
diff --git a/collects/combinator-parser/private-combinator/info.ss b/collects/combinator-parser/private-combinator/info.ss
index 8ac9a3c7b9..c14a2ca411 100644
--- a/collects/combinator-parser/private-combinator/info.ss
+++ b/collects/combinator-parser/private-combinator/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Combinator-parser private-combinator")
diff --git a/collects/compiler/info.ss b/collects/compiler/info.ss
index 4bb023e87a..e6a1a1161a 100644
--- a/collects/compiler/info.ss
+++ b/collects/compiler/info.ss
@@ -1,7 +1,5 @@
 #lang setup/infotab
 
-(define name "mzc")
-
 (define scribblings '(("cffi.scrbl")))
 (define doc-categories '((foreign -1)))
 
diff --git a/collects/compiler/private/info.ss b/collects/compiler/private/info.ss
index 432accd33d..c14a2ca411 100644
--- a/collects/compiler/private/info.ss
+++ b/collects/compiler/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "mzc private")
diff --git a/collects/config/info.ss b/collects/config/info.ss
index 93ed1c1fd4..044302875e 100644
--- a/collects/config/info.ss
+++ b/collects/config/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Config")
 (define scribblings '(("config.scrbl")))
diff --git a/collects/drscheme/info.ss b/collects/drscheme/info.ss
index b99110b3a5..9f6556b3cd 100644
--- a/collects/drscheme/info.ss
+++ b/collects/drscheme/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "DrScheme")
 (define tools (list "syncheck.ss" (list "time-keystrokes.ss" "private")))
 (define tool-names (list "Check Syntax" "Time Keystrokes"))
 (define mred-launcher-names     (list "DrScheme"))
diff --git a/collects/drscheme/private/info.ss b/collects/drscheme/private/info.ss
index 1ab7b46d88..c14a2ca411 100644
--- a/collects/drscheme/private/info.ss
+++ b/collects/drscheme/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "DrScheme private")
diff --git a/collects/dynext/info.ss b/collects/dynext/info.ss
index 2be97e5d1c..ceb96b87b4 100644
--- a/collects/dynext/info.ss
+++ b/collects/dynext/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Dynext")
 (define scribblings '(("dynext.scrbl" (multi-page))))
diff --git a/collects/embedded-gui/info.ss b/collects/embedded-gui/info.ss
index c35fa00d50..c14a2ca411 100644
--- a/collects/embedded-gui/info.ss
+++ b/collects/embedded-gui/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Embedded GUI")
diff --git a/collects/eopl/private/info.ss b/collects/eopl/private/info.ss
index 49147e5bc5..c14a2ca411 100644
--- a/collects/eopl/private/info.ss
+++ b/collects/eopl/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "EoPL private")
diff --git a/collects/errortrace/info.ss b/collects/errortrace/info.ss
index 97b51a045a..c14a2ca411 100644
--- a/collects/errortrace/info.ss
+++ b/collects/errortrace/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Errortrace")
diff --git a/collects/errortrace/scribblings/info.ss b/collects/errortrace/scribblings/info.ss
index 432db6c85f..055bbc5c87 100644
--- a/collects/errortrace/scribblings/info.ss
+++ b/collects/errortrace/scribblings/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Errortrace documentation")
 (define scribblings '(("errortrace.scrbl" (multi-page))))
diff --git a/collects/ffi/info.ss b/collects/ffi/info.ss
index ca9655d1e1..2119f78f5c 100644
--- a/collects/ffi/info.ss
+++ b/collects/ffi/info.ss
@@ -1,3 +1,3 @@
 #lang setup/infotab
 
-(define name "Foreign Function Interfaces")
+(define name "Sample FFIs")
diff --git a/collects/file/info.ss b/collects/file/info.ss
index e273cd402a..c14a2ca411 100644
--- a/collects/file/info.ss
+++ b/collects/file/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "File")
diff --git a/collects/file/scribblings/info.ss b/collects/file/scribblings/info.ss
index 3946d7aed2..41d8077a05 100644
--- a/collects/file/scribblings/info.ss
+++ b/collects/file/scribblings/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "File documentation")
 (define scribblings '(("file.scrbl" (multi-page))))
diff --git a/collects/framework/info.ss b/collects/framework/info.ss
index 7c2b38f5f7..c14a2ca411 100644
--- a/collects/framework/info.ss
+++ b/collects/framework/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Framework")
diff --git a/collects/framework/private/info.ss b/collects/framework/private/info.ss
index a131dee464..1540052563 100644
--- a/collects/framework/private/info.ss
+++ b/collects/framework/private/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Framework private")
 (define compile-omit-files '("standard-menus.ss"))
diff --git a/collects/frtime/demos/gui/info.ss b/collects/frtime/demos/gui/info.ss
index eb3faf555c..ce26c02520 100644
--- a/collects/frtime/demos/gui/info.ss
+++ b/collects/frtime/demos/gui/info.ss
@@ -1,3 +1,3 @@
 #lang setup/infotab
 
-(define name "frtime gui wrapper")
+(define name "gui wrapper")
diff --git a/collects/frtime/info.ss b/collects/frtime/info.ss
index 921a151f1a..9a5b3eaa0c 100644
--- a/collects/frtime/info.ss
+++ b/collects/frtime/info.ss
@@ -1,7 +1,5 @@
 #lang setup/infotab
 
-(define name "frtime")
-
 (define scribblings '(("frtime.scrbl" ())))
 (define compile-subcollections '(("frtime" "demos" "gui")))
 (define tools      '("frtime-tool.ss"))
diff --git a/collects/games/aces/info.ss b/collects/games/aces/info.ss
index a1efd0930e..92b49d4c17 100644
--- a/collects/games/aces/info.ss
+++ b/collects/games/aces/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Aces")
 (define game "aces.scm")
 (define game-set "Card Games")
diff --git a/collects/games/blackjack/info.ss b/collects/games/blackjack/info.ss
index 91600b9391..3de489a479 100644
--- a/collects/games/blackjack/info.ss
+++ b/collects/games/blackjack/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Blackjack")
 (define game "blackjack.ss")
 (define game-set "Card Games")
diff --git a/collects/games/cards/info.ss b/collects/games/cards/info.ss
index 00d5f7a68f..3dea213019 100644
--- a/collects/games/cards/info.ss
+++ b/collects/games/cards/info.ss
@@ -1,4 +1,4 @@
 #lang setup/infotab
 
-(define name "Game Cards")
+(define name "Cards game library")
 (define scribblings '(("cards.scrbl")))
diff --git a/collects/games/checkers/info.ss b/collects/games/checkers/info.ss
index 3819068fc9..81fdba2acc 100644
--- a/collects/games/checkers/info.ss
+++ b/collects/games/checkers/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Checkers")
 (define game "checkers.ss")
 (define game-set "Board Games")
diff --git a/collects/games/doors/doc.txt b/collects/games/doors/doc.txt
index a5104bba43..4cbbb6e1f2 100644
--- a/collects/games/doors/doc.txt
+++ b/collects/games/doors/doc.txt
@@ -2,7 +2,7 @@ _doors.ss_
 
 The "doors.ss" library builds on "gl-board.ss" to support simple
 maze-like games, where the maze is formed by a grid of squares and
-doors of various types can appears between adjacent squares.
+doors of various types appears between adjacent squares.
 
 But it's not ready, yet. Check back later.
 
diff --git a/collects/games/games.ss b/collects/games/games.ss
index 9cbdb7e1f1..9f8e2b4562 100644
--- a/collects/games/games.ss
+++ b/collects/games/games.ss
@@ -15,7 +15,8 @@
     (and main
          (make-game
           (gamefile main)
-          (info 'name (lambda () (string-titlecase game)))
+          (info 'name (lambda ()
+                        (string-titlecase (regexp-replace* #rx"-" game " "))))
           (info 'game-set  (lambda () "Other Games"))
           (info 'game-icon (lambda () (gamefile (format "~a.png" game))))))))
 
diff --git a/collects/games/gobblet/info.ss b/collects/games/gobblet/info.ss
index c4c0f46e27..a6e67b2043 100644
--- a/collects/games/gobblet/info.ss
+++ b/collects/games/gobblet/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Gobblet")
 (define game "gobblet.ss")
 (define game-set "Board Games")
diff --git a/collects/games/info.ss b/collects/games/info.ss
index 72a4fbd5d5..11eba1f6b0 100644
--- a/collects/games/info.ss
+++ b/collects/games/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Games")
 (define mred-launcher-libraries (list "games.ss"))
 (define mred-launcher-names (list "PLT Games"))
 (define doc-sub-collections
diff --git a/collects/games/jewel/info.ss b/collects/games/jewel/info.ss
index 530d6e8a20..246f32da58 100644
--- a/collects/games/jewel/info.ss
+++ b/collects/games/jewel/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Jewel")
 (define game "jewel.scm")
 (define game-set "Puzzle Games")
diff --git a/collects/games/lights-out/info.ss b/collects/games/lights-out/info.ss
index b5930cfb92..d6d1b2b776 100644
--- a/collects/games/lights-out/info.ss
+++ b/collects/games/lights-out/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Lights Out")
 (define game-set "Puzzle Games")
 (define game "lights-out.ss")
diff --git a/collects/games/memory/info.ss b/collects/games/memory/info.ss
index f68f2c3461..f8ee7ed4c9 100644
--- a/collects/games/memory/info.ss
+++ b/collects/games/memory/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Memory")
 (define game "memory.ss")
 (define game-set "Card Games")
diff --git a/collects/games/paint-by-numbers/info.ss b/collects/games/paint-by-numbers/info.ss
index a6a786b1f0..73861ab1c3 100644
--- a/collects/games/paint-by-numbers/info.ss
+++ b/collects/games/paint-by-numbers/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Paint by Numbers")
 (define game "paint-by-numbers.ss")
 (define game-set "Puzzle Games")
 (define compile-omit-files
diff --git a/collects/games/parcheesi/info.ss b/collects/games/parcheesi/info.ss
index ffe6bba729..a898213f33 100644
--- a/collects/games/parcheesi/info.ss
+++ b/collects/games/parcheesi/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Parcheesi")
 (define game "parcheesi.ss")
 (define game-set "Board Games")
diff --git a/collects/games/pousse/info.ss b/collects/games/pousse/info.ss
index cf7f82e9bc..63f1b96690 100644
--- a/collects/games/pousse/info.ss
+++ b/collects/games/pousse/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Pousse")
 (define game "pousse.ss")
 (define game-set "Board Games")
diff --git a/collects/games/same/info.ss b/collects/games/same/info.ss
index 4ef2b2ab3d..00ae903246 100644
--- a/collects/games/same/info.ss
+++ b/collects/games/same/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Same")
 (define game-set "Puzzle Games")
 (define game "same.ss")
diff --git a/collects/games/slidey/info.ss b/collects/games/slidey/info.ss
index 5e37d2f546..8194fa5102 100644
--- a/collects/games/slidey/info.ss
+++ b/collects/games/slidey/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Slidey")
 (define game-set "Puzzle Games")
 (define game "slidey.ss")
diff --git a/collects/games/spider/info.ss b/collects/games/spider/info.ss
index 8c5652621b..0cf3a1be38 100644
--- a/collects/games/spider/info.ss
+++ b/collects/games/spider/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Spider")
 (define game "spider.ss")
 (define game-set "Card Games")
diff --git a/collects/graphics/info.ss b/collects/graphics/info.ss
index 39d89ce11d..4e693a1e7d 100644
--- a/collects/graphics/info.ss
+++ b/collects/graphics/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Graphics")
 (define compile-omit-files '("value-turex.ss" "value-turtle-lib.ss"))
diff --git a/collects/graphics/scribblings/info.ss b/collects/graphics/scribblings/info.ss
index ab0a8ebe52..e60f295df2 100644
--- a/collects/graphics/scribblings/info.ss
+++ b/collects/graphics/scribblings/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Graphics documentation")
 (define scribblings '(("graphics.scrbl" (multi-page))))
 (define doc-categories '(legacy))
diff --git a/collects/handin-server/info.ss b/collects/handin-server/info.ss
index c6804e6e6d..c14a2ca411 100644
--- a/collects/handin-server/info.ss
+++ b/collects/handin-server/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Handin Server")
diff --git a/collects/help/info.ss b/collects/help/info.ss
index f53fdce341..d7e366323d 100644
--- a/collects/help/info.ss
+++ b/collects/help/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Help")
 (define post-install-collection "installer.ss")
diff --git a/collects/honu-module/info.ss b/collects/honu-module/info.ss
index ece1feefd3..6b909dd4e1 100644
--- a/collects/honu-module/info.ss
+++ b/collects/honu-module/info.ss
@@ -1,3 +1,3 @@
 #lang setup/infotab
 
-(define name "#honu")
+(define name "#honu Language")
diff --git a/collects/htdch/colors/info.ss b/collects/htdch/colors/info.ss
index 79cdae7b2e..acdf9ed51b 100644
--- a/collects/htdch/colors/info.ss
+++ b/collects/htdch/colors/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Colors Teachpack")
 (define assume-virtual-sources #t)
 (define install-collection "installer.ss")
 ;; (define pre-install-collection "pre-installer.ss")
diff --git a/collects/htdch/draw/info.ss b/collects/htdch/draw/info.ss
index de65ce6c02..acdf9ed51b 100644
--- a/collects/htdch/draw/info.ss
+++ b/collects/htdch/draw/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Draw Teachpack")
 (define assume-virtual-sources #t)
 (define install-collection "installer.ss")
 ;; (define pre-install-collection "pre-installer.ss")
diff --git a/collects/htdch/geometry/info.ss b/collects/htdch/geometry/info.ss
index 1ebb605a66..acdf9ed51b 100644
--- a/collects/htdch/geometry/info.ss
+++ b/collects/htdch/geometry/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Geometry Teachpack")
 (define assume-virtual-sources #t)
 (define install-collection "installer.ss")
 ;; (define pre-install-collection "pre-installer.ss")
diff --git a/collects/htdch/graphics/info.ss b/collects/htdch/graphics/info.ss
index ee881b10d1..155aac5d13 100644
--- a/collects/htdch/graphics/info.ss
+++ b/collects/htdch/graphics/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Java Graphics Teachpack")
 (define assume-virtual-sources #t)
 (define install-collection "installer.ss")
diff --git a/collects/htdch/idraw/info.ss b/collects/htdch/idraw/info.ss
index 41a4e4f49a..6c46e8acf7 100644
--- a/collects/htdch/idraw/info.ss
+++ b/collects/htdch/idraw/info.ss
@@ -1,6 +1,6 @@
 #lang setup/infotab
 
-(define name "Imperative Draw Teachpack")
+(define name "Imperative Drawing")
 (define assume-virtual-sources #t)
 (define install-collection "installer.ss")
 ;; (define pre-install-collection "pre-installer.ss")
diff --git a/collects/htdch/info.ss b/collects/htdch/info.ss
index dedaf0aa74..2da8ed5e45 100644
--- a/collects/htdch/info.ss
+++ b/collects/htdch/info.ss
@@ -1,6 +1,6 @@
 #lang setup/infotab
 
-(define name "htdch")
+(define name "Java Teachpacks")
 (define compile-subcollections
   '(("htdch" "draw")
     ("htdch" "geometry")
diff --git a/collects/html/info.ss b/collects/html/info.ss
index dc05937f50..0d8853d4bc 100644
--- a/collects/html/info.ss
+++ b/collects/html/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "HTML")
 (define scribblings '(("html.scrbl")))
 (define compile-omit-files
   '("dtd.ss" "dtdr.ss" "dtds.ss" "dtd-ast.ss" "case.ss" "html-structs.ss"
diff --git a/collects/lang/private/info.ss b/collects/lang/private/info.ss
index 3954b55cf0..c14a2ca411 100644
--- a/collects/lang/private/info.ss
+++ b/collects/lang/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "HtDP Languages Private")
diff --git a/collects/launcher/info.ss b/collects/launcher/info.ss
index cb7d958fd7..c14a2ca411 100644
--- a/collects/launcher/info.ss
+++ b/collects/launcher/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Launcher")
diff --git a/collects/macro-debugger/info.ss b/collects/macro-debugger/info.ss
index cd94c97b39..94a10ba479 100644
--- a/collects/macro-debugger/info.ss
+++ b/collects/macro-debugger/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Macro Debugger")
 (define tools '(["tool.ss"]))
 (define tool-names '("Macro Stepper"))
 (define scribblings '(("macro-debugger.scrbl")))
diff --git a/collects/macro-debugger/model/info.ss b/collects/macro-debugger/model/info.ss
index 0c51c45aec..2bc5ac2fb3 100644
--- a/collects/macro-debugger/model/info.ss
+++ b/collects/macro-debugger/model/info.ss
@@ -1,3 +1,3 @@
 #lang setup/infotab
 
-(define name "Macro Debugger expansion model")
+(define name "Expansion Model")
diff --git a/collects/macro-debugger/syntax-browser/info.ss b/collects/macro-debugger/syntax-browser/info.ss
index 680225ff04..c14a2ca411 100644
--- a/collects/macro-debugger/syntax-browser/info.ss
+++ b/collects/macro-debugger/syntax-browser/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Macro Debugger - Syntax Browser")
diff --git a/collects/macro-debugger/view/info.ss b/collects/macro-debugger/view/info.ss
index 12eb0a75ef..be50e54fd7 100644
--- a/collects/macro-debugger/view/info.ss
+++ b/collects/macro-debugger/view/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Macro Debugger view")
 (define compile-omit-files '("browse-deriv.ss" "show-deriv.ss"))
diff --git a/collects/make/info.ss b/collects/make/info.ss
index 8eae1895ea..c14a2ca411 100644
--- a/collects/make/info.ss
+++ b/collects/make/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Make")
diff --git a/collects/mred/info.ss b/collects/mred/info.ss
index dbebf9d742..40fb41f943 100644
--- a/collects/mred/info.ss
+++ b/collects/mred/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "MrEd")
 (define version '(400))
 (define post-install-collection "script-installer.ss")
diff --git a/collects/mred/lang/info.ss b/collects/mred/lang/info.ss
index 7c53b53ccc..c14a2ca411 100644
--- a/collects/mred/lang/info.ss
+++ b/collects/mred/lang/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "MrEd #lang")
diff --git a/collects/mred/private/info.ss b/collects/mred/private/info.ss
index 427ddc9b94..c14a2ca411 100644
--- a/collects/mred/private/info.ss
+++ b/collects/mred/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "MrEd private")
diff --git a/collects/mrlib/info.ss b/collects/mrlib/info.ss
index 5bbfefcb16..c14a2ca411 100644
--- a/collects/mrlib/info.ss
+++ b/collects/mrlib/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "MrLib")
diff --git a/collects/mrlib/private/info.ss b/collects/mrlib/private/info.ss
index 197731624a..c14a2ca411 100644
--- a/collects/mrlib/private/info.ss
+++ b/collects/mrlib/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "MrLib private")
diff --git a/collects/mrlib/scribblings/info.ss b/collects/mrlib/scribblings/info.ss
index aded43ac30..4647e1a3c2 100644
--- a/collects/mrlib/scribblings/info.ss
+++ b/collects/mrlib/scribblings/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "MrLib documentation")
 (define scribblings '(("mrlib.scrbl" (multi-page))))
diff --git a/collects/mysterx/info.ss b/collects/mysterx/info.ss
index 0a525e3f75..d7e366323d 100644
--- a/collects/mysterx/info.ss
+++ b/collects/mysterx/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "MysterX")
 (define post-install-collection "installer.ss")
diff --git a/collects/mzcom/info.ss b/collects/mzcom/info.ss
index 62b7047e9d..d7e366323d 100644
--- a/collects/mzcom/info.ss
+++ b/collects/mzcom/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "MzCOM")
 (define post-install-collection "installer.ss")
diff --git a/collects/mzlib/info.ss b/collects/mzlib/info.ss
index 886e5a29f5..c14a2ca411 100644
--- a/collects/mzlib/info.ss
+++ b/collects/mzlib/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "MzLib")
diff --git a/collects/mzlib/private/info.ss b/collects/mzlib/private/info.ss
index 117ffa69cf..037595c0d0 100644
--- a/collects/mzlib/private/info.ss
+++ b/collects/mzlib/private/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "MzLib private")
 (define compile-omit-files '("shared-body.ss"))
diff --git a/collects/mzlib/scribblings/info.ss b/collects/mzlib/scribblings/info.ss
index 9a6b66f6f0..5d1e0b95ab 100644
--- a/collects/mzlib/scribblings/info.ss
+++ b/collects/mzlib/scribblings/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "MzLib documentation")
 (define scribblings '(("mzlib.scrbl" (multi-page))))
 (define doc-categories '(legacy))
diff --git a/collects/mzscheme/info.ss b/collects/mzscheme/info.ss
index 384431df5e..697de8483a 100644
--- a/collects/mzscheme/info.ss
+++ b/collects/mzscheme/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "MzScheme")
 (define version '(400))
 
 (define scribblings '(("mzscheme.scrbl" (multi-page))))
diff --git a/collects/mzscheme/lang/info.ss b/collects/mzscheme/lang/info.ss
index e4749ae574..c14a2ca411 100644
--- a/collects/mzscheme/lang/info.ss
+++ b/collects/mzscheme/lang/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "MzScheme #lang")
diff --git a/collects/net/info.ss b/collects/net/info.ss
index 5386eabcd1..c14a2ca411 100644
--- a/collects/net/info.ss
+++ b/collects/net/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Net")
diff --git a/collects/net/scribblings/info.ss b/collects/net/scribblings/info.ss
index 8a7034cad0..ca005d8a28 100644
--- a/collects/net/scribblings/info.ss
+++ b/collects/net/scribblings/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Net documentation")
 (define scribblings '(("net.scrbl" (multi-page))))
diff --git a/collects/parser-tools/info.ss b/collects/parser-tools/info.ss
index c5ee25f389..c14a2ca411 100644
--- a/collects/parser-tools/info.ss
+++ b/collects/parser-tools/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Parser-tools")
diff --git a/collects/parser-tools/private-lex/info.ss b/collects/parser-tools/private-lex/info.ss
index 3b81d2f364..ac5460be1a 100644
--- a/collects/parser-tools/private-lex/info.ss
+++ b/collects/parser-tools/private-lex/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
 (define compile-omit-files (list "error-tests.ss"))
-(define name "Parser-tools private-lex")
diff --git a/collects/parser-tools/private-yacc/info.ss b/collects/parser-tools/private-yacc/info.ss
index 280d6273f0..c14a2ca411 100644
--- a/collects/parser-tools/private-yacc/info.ss
+++ b/collects/parser-tools/private-yacc/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Parser-tools private-yacc")
diff --git a/collects/plot/info.ss b/collects/plot/info.ss
index ea90aedaac..1586d46a15 100644
--- a/collects/plot/info.ss
+++ b/collects/plot/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Plot library")
 (define pre-install-collection "pre-installer.ss")
diff --git a/collects/preprocessor/info.ss b/collects/preprocessor/info.ss
index d36f2576d9..77fc6703a4 100644
--- a/collects/preprocessor/info.ss
+++ b/collects/preprocessor/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Preprocessor")
 (define mzscheme-launcher-names     '("mzpp"        "mztext"))
 (define mzscheme-launcher-libraries '("mzpp-run.ss" "mztext-run.ss"))
diff --git a/collects/profj/comb-parsers/info.ss b/collects/profj/comb-parsers/info.ss
index d65f2e692d..c14a2ca411 100644
--- a/collects/profj/comb-parsers/info.ss
+++ b/collects/profj/comb-parsers/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "ProfessorJ: parser")
diff --git a/collects/profj/libs/java/io/info.ss b/collects/profj/libs/java/io/info.ss
index 4f02b8804f..52b20ab1dd 100644
--- a/collects/profj/libs/java/io/info.ss
+++ b/collects/profj/libs/java/io/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "ProfessorJ: libs java io")
 ;; (define install-collection "installer.ss")
diff --git a/collects/profj/libs/java/lang/info.ss b/collects/profj/libs/java/lang/info.ss
index a3aa845c60..d1c30e3152 100644
--- a/collects/profj/libs/java/lang/info.ss
+++ b/collects/profj/libs/java/lang/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "ProfessorJ: libs java lang")
 (define assume-virtual-sources #t)
 ;; (define install-collection "installer.ss")
diff --git a/collects/profj/libs/java/tester/info.ss b/collects/profj/libs/java/tester/info.ss
index 05f3536343..52b20ab1dd 100644
--- a/collects/profj/libs/java/tester/info.ss
+++ b/collects/profj/libs/java/tester/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "ProfessorJ: libs java tester")
 ;; (define install-collection "installer.ss")
diff --git a/collects/profj/libs/java/util/info.ss b/collects/profj/libs/java/util/info.ss
index 9a5d1ffa36..d1c30e3152 100644
--- a/collects/profj/libs/java/util/info.ss
+++ b/collects/profj/libs/java/util/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "ProfessorJ: libs java util")
 (define assume-virtual-sources #t)
 ;; (define install-collection "installer.ss")
diff --git a/collects/profj/parsers/info.ss b/collects/profj/parsers/info.ss
index 933671c8ea..c14a2ca411 100644
--- a/collects/profj/parsers/info.ss
+++ b/collects/profj/parsers/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "ProfessorJ: parsers")
diff --git a/collects/r5rs/info.ss b/collects/r5rs/info.ss
index 5e9aafb613..49b003b15c 100644
--- a/collects/r5rs/info.ss
+++ b/collects/r5rs/info.ss
@@ -1,7 +1,5 @@
 #lang setup/infotab
 
-(define name "R5RS")
-
 (define scribblings '(("r5rs.scrbl" (multi-page))))
 (define doc-categories '((legacy 1)))
 
diff --git a/collects/r5rs/lang/info.ss b/collects/r5rs/lang/info.ss
index 01c70ccf46..c14a2ca411 100644
--- a/collects/r5rs/lang/info.ss
+++ b/collects/r5rs/lang/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "R5RS Languages")
diff --git a/collects/readline/info.ss b/collects/readline/info.ss
index 22720f52c7..f261cc0e23 100644
--- a/collects/readline/info.ss
+++ b/collects/readline/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "readline")
 (define scribblings '(("readline.scrbl")))
diff --git a/collects/repos-time-stamp/info.ss b/collects/repos-time-stamp/info.ss
index af0e2e0086..c012efd755 100644
--- a/collects/repos-time-stamp/info.ss
+++ b/collects/repos-time-stamp/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Repository Time Stamp")
 (define tools (list "time-stamp.ss"))
 (define tool-names (list "Repository Time Stamp"))
diff --git a/collects/s-exp/info.ss b/collects/s-exp/info.ss
index d7c7e13b95..ceadf02ccb 100644
--- a/collects/s-exp/info.ss
+++ b/collects/s-exp/info.ss
@@ -1,3 +1,3 @@
 #lang setup/infotab
 
-(define name "S-expression Module")
+(define name "S-Expression Module Reader")
diff --git a/collects/s-exp/lang/info.ss b/collects/s-exp/lang/info.ss
index 2c9b257feb..c14a2ca411 100644
--- a/collects/s-exp/lang/info.ss
+++ b/collects/s-exp/lang/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "S-expression Module reader")
diff --git a/collects/scheme/info.ss b/collects/scheme/info.ss
index 57e04363f7..c14a2ca411 100644
--- a/collects/scheme/info.ss
+++ b/collects/scheme/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Scheme")
diff --git a/collects/scribble/info.ss b/collects/scribble/info.ss
index eb45b45dff..805d59f03b 100644
--- a/collects/scribble/info.ss
+++ b/collects/scribble/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Scribble")
 (define mzscheme-launcher-names '("scribble"))
 (define mzscheme-launcher-libraries '("scribble.ss"))
 (define compile-omit-files '("test-reader.ss"))
diff --git a/collects/scribblings/acks/info.ss b/collects/scribblings/acks/info.ss
index a6bfbb5d83..6893d107c2 100644
--- a/collects/scribblings/acks/info.ss
+++ b/collects/scribblings/acks/info.ss
@@ -1,5 +1,5 @@
 #lang setup/infotab
 
-(define name "Scribblings: Acknowledgments")
+(define name "Acknowledgments")
 (define scribblings '(("acks.scrbl")))
 (define doc-categories '(omit))
diff --git a/collects/scribblings/drscheme/info.ss b/collects/scribblings/drscheme/info.ss
index 82d9ba61c3..4bf38af494 100644
--- a/collects/scribblings/drscheme/info.ss
+++ b/collects/scribblings/drscheme/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: DrScheme")
 (define scribblings '(("drscheme.scrbl" (multi-page))))
 (define doc-categories '((tool 1)))
diff --git a/collects/scribblings/foreign/info.ss b/collects/scribblings/foreign/info.ss
index fd69acb2a4..0413d321e1 100644
--- a/collects/scribblings/foreign/info.ss
+++ b/collects/scribblings/foreign/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: FFI")
 (define scribblings '(("foreign.scrbl" (multi-page))))
 (define doc-categories '((foreign 1)))
diff --git a/collects/scribblings/framework/info.ss b/collects/scribblings/framework/info.ss
index 0283263b69..eeace92522 100644
--- a/collects/scribblings/framework/info.ss
+++ b/collects/scribblings/framework/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Scribblings: Framework")
 (define scribblings '(("framework.scrbl" (#;multi-page))))
diff --git a/collects/scribblings/gui/info.ss b/collects/scribblings/gui/info.ss
index 6a48816945..93e5ddf1df 100644
--- a/collects/scribblings/gui/info.ss
+++ b/collects/scribblings/gui/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Scribblings: GUI")
 (define scribblings '(("gui.scrbl" (multi-page))))
diff --git a/collects/scribblings/guide/info.ss b/collects/scribblings/guide/info.ss
index 3b441aab4a..5a4b016b6b 100644
--- a/collects/scribblings/guide/info.ss
+++ b/collects/scribblings/guide/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Guide")
 (define scribblings '(("guide.scrbl" (multi-page))))
 (define doc-categories '(getting-started))
diff --git a/collects/scribblings/honu/info.ss b/collects/scribblings/honu/info.ss
index 2d5ba55506..0180de5d6c 100644
--- a/collects/scribblings/honu/info.ss
+++ b/collects/scribblings/honu/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Honu")
 (define scribblings '(("honu.scrbl" (multi-page))))
 (define doc-categories '(other))
diff --git a/collects/scribblings/htdp-langs/info.ss b/collects/scribblings/htdp-langs/info.ss
index 3c72bcc852..92db2282a7 100644
--- a/collects/scribblings/htdp-langs/info.ss
+++ b/collects/scribblings/htdp-langs/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: HtDP Languages")
 (define scribblings '(("htdp-langs.scrbl" (multi-page))))
 (define doc-categories '((language -1)))
diff --git a/collects/scribblings/info.ss b/collects/scribblings/info.ss
index 7c2f286d01..8899ff961b 100644
--- a/collects/scribblings/info.ss
+++ b/collects/scribblings/info.ss
@@ -1,3 +1,3 @@
 #lang setup/infotab
 
-(define name "Scribblings")
+(define name "Documentation Sources")
diff --git a/collects/scribblings/inside/info.ss b/collects/scribblings/inside/info.ss
index 477dcc24a5..ee51694d0d 100644
--- a/collects/scribblings/inside/info.ss
+++ b/collects/scribblings/inside/info.ss
@@ -1,5 +1,5 @@
 #lang setup/infotab
 
-(define name "Scribblings: Inside PLT Scheme")
+(define name "Inside PLT Scheme")
 (define scribblings '(("inside.scrbl" (multi-page))))
 (define doc-categories '(foreign))
diff --git a/collects/scribblings/license/info.ss b/collects/scribblings/license/info.ss
index b1685d8677..e9b86e6242 100644
--- a/collects/scribblings/license/info.ss
+++ b/collects/scribblings/license/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: License")
 (define scribblings '(("license.scrbl")))
 (define doc-categories '(omit))
diff --git a/collects/scribblings/master-index/info.ss b/collects/scribblings/master-index/info.ss
index 296f953500..d9eb37ac3d 100644
--- a/collects/scribblings/master-index/info.ss
+++ b/collects/scribblings/master-index/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Master Index")
 (define scribblings '(("master-index.scrbl" (depends-all-main no-depend-on))))
 (define doc-categories '(omit))
diff --git a/collects/scribblings/more/info.ss b/collects/scribblings/more/info.ss
index 87e7e9d171..869f5bd382 100644
--- a/collects/scribblings/more/info.ss
+++ b/collects/scribblings/more/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: More")
 (define scribblings '(("more.scrbl" ())))
 (define doc-categories '((getting-started 1)))
diff --git a/collects/scribblings/mzc/info.ss b/collects/scribblings/mzc/info.ss
index ab1c01f72d..e754b74355 100644
--- a/collects/scribblings/mzc/info.ss
+++ b/collects/scribblings/mzc/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: mzc")
 (define scribblings '(("mzc.scrbl" (multi-page))))
 (define doc-categories '(tool))
diff --git a/collects/scribblings/quick/info.ss b/collects/scribblings/quick/info.ss
index c0d3833458..58adea6af9 100644
--- a/collects/scribblings/quick/info.ss
+++ b/collects/scribblings/quick/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Quick")
 (define scribblings '(("quick.scrbl" ())))
 (define doc-categories '((getting-started 2)))
diff --git a/collects/scribblings/reference/info.ss b/collects/scribblings/reference/info.ss
index 20415eb15a..04609c02da 100644
--- a/collects/scribblings/reference/info.ss
+++ b/collects/scribblings/reference/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Reference")
 (define scribblings '(("reference.scrbl" (multi-page))))
 (define doc-categories '(language))
diff --git a/collects/scribblings/release/info.ss b/collects/scribblings/release/info.ss
index d7a1b1b12b..f1deec1889 100644
--- a/collects/scribblings/release/info.ss
+++ b/collects/scribblings/release/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Release Notes")
 (define scribblings '(("release.scrbl")))
 (define doc-categories '(omit))
diff --git a/collects/scribblings/scribble/info.ss b/collects/scribblings/scribble/info.ss
index 933d3c2560..ddd6ca1f63 100644
--- a/collects/scribblings/scribble/info.ss
+++ b/collects/scribblings/scribble/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Scribble")
 (define scribblings '(("scribble.scrbl" (multi-page))))
 (define doc-categories '(tool))
diff --git a/collects/scribblings/setup-plt/info.ss b/collects/scribblings/setup-plt/info.ss
index d5f8fc9d03..05350cc896 100644
--- a/collects/scribblings/setup-plt/info.ss
+++ b/collects/scribblings/setup-plt/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: setup-plt")
 (define scribblings '(("setup-plt.scrbl" (multi-page))))
 (define doc-categories '(tool))
diff --git a/collects/scribblings/slideshow/info.ss b/collects/scribblings/slideshow/info.ss
index d86da3af74..78ddc0c092 100644
--- a/collects/scribblings/slideshow/info.ss
+++ b/collects/scribblings/slideshow/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Slideshow")
 (define scribblings '(("slideshow.scrbl" (multi-page))))
 (define doc-categories '(tool))
diff --git a/collects/scribblings/start/info.ss b/collects/scribblings/start/info.ss
index b2a71143c5..ed5593aada 100644
--- a/collects/scribblings/start/info.ss
+++ b/collects/scribblings/start/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Scribblings: Start")
 (define scribblings
   '(("start.scrbl" (main-doc-root always-run depends-all-main no-depend-on))))
 (define doc-categories '(omit))
diff --git a/collects/scribblings/tools/info.ss b/collects/scribblings/tools/info.ss
index 3f6c631708..50baed85bd 100644
--- a/collects/scribblings/tools/info.ss
+++ b/collects/scribblings/tools/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Scribblings: Tools")
 (define scribblings '(("tools.scrbl" (multi-page))))
 (define doc-categories '(other))
diff --git a/collects/scribblings/user-master-index/info.ss b/collects/scribblings/user-master-index/info.ss
index 6db8dd2755..b9e815926b 100644
--- a/collects/scribblings/user-master-index/info.ss
+++ b/collects/scribblings/user-master-index/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Scribblings: User Master Index")
 (define scribblings
   '(("master-index.scrbl" (user-doc depends-all no-depend-on))))
 (define doc-categories '(omit))
diff --git a/collects/scribblings/user-start/info.ss b/collects/scribblings/user-start/info.ss
index e4b6a352ec..07f899cb50 100644
--- a/collects/scribblings/user-start/info.ss
+++ b/collects/scribblings/user-start/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Scribblings: User Start")
 (define scribblings
   '(("user-start.scrbl" (user-doc-root depends-all always-run no-depend-on))))
 (define doc-categories '(omit))
diff --git a/collects/setup/setup-unit.ss b/collects/setup/setup-unit.ss
index 8796d601d8..76f1df8bd2 100644
--- a/collects/setup/setup-unit.ss
+++ b/collects/setup/setup-unit.ss
@@ -172,8 +172,12 @@
                         'setup-plt
                         "'name' result from collection ~e is not a string: ~e"
                         collection-p
-                        x))))])
-      (and name
+                        x))))]
+           [name (string-append (path->string (apply build-path collection-p))
+                                (if name
+                                  (string-append " (" name ")")
+                                  ""))])
+      (and info
            (make-cc collection-p
                     (apply collection-path collection-p)
                     name
diff --git a/collects/sgl/info.ss b/collects/sgl/info.ss
index cccded2b4e..40cb64e3d4 100644
--- a/collects/sgl/info.ss
+++ b/collects/sgl/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "sgl")
 (define pre-install-collection "makefile.ss")
 (define compile-omit-files (list))
 (define virtual-sources '("gl-info.ss"))
diff --git a/collects/sirmail/info.ss b/collects/sirmail/info.ss
index 1b6ba11309..311011bdd4 100644
--- a/collects/sirmail/info.ss
+++ b/collects/sirmail/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "SirMail")
 (define mred-launcher-libraries (list "sirmail.ss"))
 (define mred-launcher-names (list "SirMail"))
 (define compile-omit-files '("recover.ss"))
diff --git a/collects/skipper/info.ss b/collects/skipper/info.ss
index 825847f51d..2a9a561cff 100644
--- a/collects/skipper/info.ss
+++ b/collects/skipper/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Skipper")
 ;; (define tools '(("debug-tool.ss")))
 ;; (define tool-names '("Skipper"))
 ;; (define tool-icons '(("icon-big.png" "skipper")))
diff --git a/collects/slatex/info.ss b/collects/slatex/info.ss
index 1dd0fd1717..64de97e40c 100644
--- a/collects/slatex/info.ss
+++ b/collects/slatex/info.ss
@@ -1,7 +1,5 @@
 #lang setup/infotab
 
-(define name "SLaTeX")
-
 (define scribblings '(("slatex-wrap.scrbl")))
 
 ;; (define tools (list (list "slatex-lang.ss")))
diff --git a/collects/slideshow/info.ss b/collects/slideshow/info.ss
index 922e8e2747..d81c650404 100644
--- a/collects/slideshow/info.ss
+++ b/collects/slideshow/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Slideshow")
 (define tools (list '("tool.ss")))
 (define tool-names (list "Slideshow"))
 (define tool-icons (list (list "slideshow.png" "slideshow")))
diff --git a/collects/srfi/1/info.ss b/collects/srfi/1/info.ss
index 23b7d209b0..397716286f 100644
--- a/collects/srfi/1/info.ss
+++ b/collects/srfi/1/info.ss
@@ -1,7 +1,5 @@
 #lang setup/infotab
 
-(define name "SRFI 1")
-
 (define compile-omit-files
   '("alist-test.ss"
     "all-srfi-1-tests.ss"
diff --git a/collects/srfi/19/info.ss b/collects/srfi/19/info.ss
index c055fd0a48..daff9302e9 100644
--- a/collects/srfi/19/info.ss
+++ b/collects/srfi/19/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "SRFI 19")
 (define compile-omit-files `("tests.ss"))
diff --git a/collects/srfi/info.ss b/collects/srfi/info.ss
index a5681d1981..c14a2ca411 100644
--- a/collects/srfi/info.ss
+++ b/collects/srfi/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "srfi")
diff --git a/collects/srpersist/info.ss b/collects/srpersist/info.ss
index 5c23fb0199..80319c9383 100644
--- a/collects/srpersist/info.ss
+++ b/collects/srpersist/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "SrPersist")
 ;; no .zo compilation necessary, since all the real code is in C++
 (define compile-omit-files '("info.ss" "srpersist.ss"))
diff --git a/collects/stepper/info.ss b/collects/stepper/info.ss
index 6e8f9f8707..d60e7cd0b7 100644
--- a/collects/stepper/info.ss
+++ b/collects/stepper/info.ss
@@ -1,7 +1,5 @@
 #lang setup/infotab
 
-(define name "Stepper")
-
 (define tools '(("stepper+xml-tool.ss")
                 ;; ("debugger-tool.ss")
                 ))
diff --git a/collects/stepper/private/info.ss b/collects/stepper/private/info.ss
index 677eba023a..c14a2ca411 100644
--- a/collects/stepper/private/info.ss
+++ b/collects/stepper/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Stepper private")
diff --git a/collects/string-constants/info.ss b/collects/string-constants/info.ss
index 7c9466a3ed..c14a2ca411 100644
--- a/collects/string-constants/info.ss
+++ b/collects/string-constants/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "String constants")
diff --git a/collects/swindle/info.ss b/collects/swindle/info.ss
index d7d9ede764..2dfbebcf57 100644
--- a/collects/swindle/info.ss
+++ b/collects/swindle/info.ss
@@ -1,7 +1,6 @@
 ;;; Written by Eli Barzilay: Maze is Life!  (eli@barzilay.org)
 #lang setup/infotab
 
-(define name "Swindle")
 (define mzscheme-launcher-names '("swindle"))
 (define mzscheme-launcher-flags '(("-li" "swindle")))
 
diff --git a/collects/syntax-color/info.ss b/collects/syntax-color/info.ss
index fc3e9a44a4..c14a2ca411 100644
--- a/collects/syntax-color/info.ss
+++ b/collects/syntax-color/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Syntax Color")
diff --git a/collects/teachpack/info.ss b/collects/teachpack/info.ss
index 2ad8365615..072da247e8 100644
--- a/collects/teachpack/info.ss
+++ b/collects/teachpack/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Teachpacks")
 (define scribblings '(("teachpacks.scrbl" (multi-page))))
 (define compile-omit-files '())
diff --git a/collects/test-box-recovery/info.ss b/collects/test-box-recovery/info.ss
index 7370abb202..145eaaa2e6 100644
--- a/collects/test-box-recovery/info.ss
+++ b/collects/test-box-recovery/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Test Box Recovery")
 (define categories '(devtools))
 (define required-core-version "370")
 (define tools (list '("tool.ss")))
diff --git a/collects/tests/drscheme/info.ss b/collects/tests/drscheme/info.ss
index ecc496a64a..a02ecd8c3f 100644
--- a/collects/tests/drscheme/info.ss
+++ b/collects/tests/drscheme/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "DrScheme Test Suite")
 (define compile-omit-files
   '("config-lang-test.ss" "drscheme-jr.ss" "drscheme-test.ss" 
     "event-efficency.ss" ;"language-test.ss"
diff --git a/collects/tests/framework/info.ss b/collects/tests/framework/info.ss
index ce7c9e7420..dec6fde677 100644
--- a/collects/tests/framework/info.ss
+++ b/collects/tests/framework/info.ss
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define name "Framework Test Suite")
 (define compile-omit-files '("key-specs.ss" "utils.ss" "receive-sexps-port.ss"))
diff --git a/collects/tests/utils/info.ss b/collects/tests/utils/info.ss
index cba7928516..c14a2ca411 100644
--- a/collects/tests/utils/info.ss
+++ b/collects/tests/utils/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Testing Utilities")
diff --git a/collects/tex2page/info.ss b/collects/tex2page/info.ss
index 15ca9e69d8..f6f25515bc 100644
--- a/collects/tex2page/info.ss
+++ b/collects/tex2page/info.ss
@@ -1,6 +1,4 @@
 #lang setup/infotab
 
-(define name "tex2page")
-
 (define mzscheme-launcher-libraries (list "start.ss"))
 (define mzscheme-launcher-names (list "tex2page"))
diff --git a/collects/texpict/info.ss b/collects/texpict/info.ss
index d0eaa698f1..c14a2ca411 100644
--- a/collects/texpict/info.ss
+++ b/collects/texpict/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Texpict")
diff --git a/collects/texpict/private/info.ss b/collects/texpict/private/info.ss
index f773d75d81..c14a2ca411 100644
--- a/collects/texpict/private/info.ss
+++ b/collects/texpict/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Texpict private")
diff --git a/collects/trace/scribblings/info.ss b/collects/trace/scribblings/info.ss
index 3772a20587..c8b496246d 100644
--- a/collects/trace/scribblings/info.ss
+++ b/collects/trace/scribblings/info.ss
@@ -1,4 +1,4 @@
 #lang setup/infotab
 
-(define name "Calltrace documentation")
+(define name "Calltrace")
 (define scribblings '(("trace.scrbl" ())))
diff --git a/collects/version/info.ss b/collects/version/info.ss
index 293614647e..b1c88e8db1 100644
--- a/collects/version/info.ss
+++ b/collects/version/info.ss
@@ -1,5 +1,4 @@
 #lang setup/infotab
 
-(define name "Version")
 (define tools (list "tool.ss"))
 (define tool-names (list "Version"))
diff --git a/collects/waterworld/info.ss b/collects/waterworld/info.ss
index b2e86d91dc..c14a2ca411 100644
--- a/collects/waterworld/info.ss
+++ b/collects/waterworld/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "WaterWorld")
diff --git a/collects/web-server/info.ss b/collects/web-server/info.ss
index e66d06ce4f..1499a7c53b 100644
--- a/collects/web-server/info.ss
+++ b/collects/web-server/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "Web Server")
 (define scribblings '(("scribblings/web-server.scrbl" (multi-page))))
 (define doc-categories '(tool))
 
diff --git a/collects/web-server/scribblings/info.ss b/collects/web-server/scribblings/info.ss
index ac3d52ca08..c14a2ca411 100644
--- a/collects/web-server/scribblings/info.ss
+++ b/collects/web-server/scribblings/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "Web Server documentation")
diff --git a/collects/wxme/info.ss b/collects/wxme/info.ss
index 3f19ea5a84..c14a2ca411 100644
--- a/collects/wxme/info.ss
+++ b/collects/wxme/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "WXME")
diff --git a/collects/xml/info.ss b/collects/xml/info.ss
index 897799cb9d..48f9ec74bc 100644
--- a/collects/xml/info.ss
+++ b/collects/xml/info.ss
@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define name "XML")
 ;; the XML tool has been moved to the stepper collection, so that the
 ;; stepper can create xml snips.  See collects/stepper/tool.ss for (a
 ;; bit) more information
diff --git a/collects/xml/private/info.ss b/collects/xml/private/info.ss
index ee848d1b60..c14a2ca411 100644
--- a/collects/xml/private/info.ss
+++ b/collects/xml/private/info.ss
@@ -1,3 +1 @@
 #lang setup/infotab
-
-(define name "XML private")