Index: uspace/app/taskbar/clock.c
===================================================================
--- uspace/app/taskbar/clock.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/clock.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -30,5 +30,5 @@
  * @{
  */
-/** @file Task bar clock.
+/** @file Taskbar clock.
  *
  * Displays the current time in an inset frame.
@@ -53,5 +53,5 @@
 static void taskbar_clock_timer(void *);
 
-/** Task bar clock control ops */
+/** Taskbar clock control ops */
 static ui_control_ops_t taskbar_clock_ctl_ops = {
 	.destroy = taskbar_clock_ctl_destroy,
@@ -61,5 +61,5 @@
 };
 
-/** Create task bar clock.
+/** Create taskbar clock.
  *
  * @param window Containing window
@@ -102,7 +102,7 @@
 }
 
-/** Destroy task bar clock.
- *
- * @param clock Task bar clock
+/** Destroy taskbar clock.
+ *
+ * @param clock Taskbar clock
  */
 void taskbar_clock_destroy(taskbar_clock_t *clock)
@@ -149,7 +149,7 @@
 }
 
-/** Paint task bar clock.
- *
- * @param clock Task bar clock
+/** Paint taskbar clock.
+ *
+ * @param clock Taskbar clock
  */
 errno_t taskbar_clock_paint(taskbar_clock_t *clock)
@@ -208,7 +208,7 @@
 }
 
-/** Handle task bar clock keyboard event.
- *
- * @param clock Task bar clock
+/** Handle taskbar clock keyboard event.
+ *
+ * @param clock Taskbar clock
  * @param event Keyboard event
  * @return ui_claimed iff event was claimed
@@ -219,7 +219,7 @@
 }
 
-/** Handle task bar clock position event.
- *
- * @param clock Task bar clock
+/** Handle taskbar clock position event.
+ *
+ * @param clock Taskbar clock
  * @param event Position event
  * @return ui_claimed iff event was claimed
@@ -237,7 +237,7 @@
 }
 
-/** Get base control for task bar clock.
- *
- * @param clock Task bar clock
+/** Get base control for taskbar clock.
+ *
+ * @param clock Taskbar clock
  * @return Base UI control
  */
@@ -247,7 +247,7 @@
 }
 
-/** Set task bar clock rectangle.
- *
- * @param clock Task bar clock
+/** Set taskbar clock rectangle.
+ *
+ * @param clock Taskbar clock
  * @param rect Rectangle
  */
@@ -277,5 +277,5 @@
 }
 
-/** Paint task bar clock control.
+/** Paint taskbar clock control.
  *
  * @param arg Argument (taskbar_clock_t *)
@@ -289,5 +289,5 @@
 }
 
-/** Handle task bar clock control keyboard event.
+/** Handle taskbar clock control keyboard event.
  *
  * @param arg Argument (taskbar_clock_t *)
@@ -302,5 +302,5 @@
 }
 
-/** Handle task bar clock control position event.
+/** Handle taskbar clock control position event.
  *
  * @param arg Argument (taskbar_clock_t *)
Index: uspace/app/taskbar/clock.h
===================================================================
--- uspace/app/taskbar/clock.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/clock.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar clock
+ * @file Taskbar clock
  */
 
Index: uspace/app/taskbar/doc/doxygroups.h
===================================================================
--- uspace/app/taskbar/doc/doxygroups.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/doc/doxygroups.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -1,4 +1,4 @@
 /** @addtogroup taskbar taskbar
- * @brief Task bar
+ * @brief Taskbar
  * @ingroup apps
  */
Index: uspace/app/taskbar/main.c
===================================================================
--- uspace/app/taskbar/main.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/main.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -30,5 +30,5 @@
  * @{
  */
-/** @file Task Bar
+/** @file Taskbar
  */
 
Index: uspace/app/taskbar/taskbar.c
===================================================================
--- uspace/app/taskbar/taskbar.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/taskbar.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -30,5 +30,5 @@
  * @{
  */
-/** @file Task Bar
+/** @file Taskbar
  */
 
@@ -114,9 +114,9 @@
 }
 
-/** Create task bar.
+/** Create taskbar.
  *
  * @param display_spec Display specification
  * @param wndmgt_svc Window management service (or WNDMGT_DEFAULT)
- * @param rtaskbar Place to store pointer to new task bar
+ * @param rtaskbar Place to store pointer to new taskbar
  * @return @c EOK on success or an error coe
  */
@@ -157,5 +157,5 @@
 
 	ui_wnd_params_init(&params);
-	params.caption = "Task Bar";
+	params.caption = "Taskbar";
 	params.placement = ui_wnd_place_bottom_left;
 
@@ -302,5 +302,5 @@
 }
 
-/** Destroy task bar. */
+/** Destroy taskbar. */
 void taskbar_destroy(taskbar_t *taskbar)
 {
Index: uspace/app/taskbar/taskbar.h
===================================================================
--- uspace/app/taskbar/taskbar.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/taskbar.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task Bar
+ * @file Taskbar
  */
 
Index: uspace/app/taskbar/tbsmenu.c
===================================================================
--- uspace/app/taskbar/tbsmenu.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/tbsmenu.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -30,5 +30,5 @@
  * @{
  */
-/** @file Task bar start menu
+/** @file Taskbar start menu
  */
 
@@ -65,5 +65,5 @@
 static errno_t tbsmenu_entry_start(tbsmenu_entry_t *);
 
-/** Create task bar start menu.
+/** Create taskbar start menu.
  *
  * @param window Containing window
@@ -199,5 +199,5 @@
 }
 
-/** Destroy task bar start menu.
+/** Destroy taskbar start menu.
  *
  * @param tbsmenu Start menu
Index: uspace/app/taskbar/tbsmenu.h
===================================================================
--- uspace/app/taskbar/tbsmenu.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/tbsmenu.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar start menu
+ * @file Taskbar start menu
  */
 
Index: uspace/app/taskbar/types/clock.h
===================================================================
--- uspace/app/taskbar/types/clock.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/types/clock.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar clock
+ * @file Taskbar clock
  */
 
@@ -41,5 +41,5 @@
 #include <ui/window.h>
 
-/** Task bar clock
+/** Taskbar clock
  *
  * This is a custom UI control.
Index: uspace/app/taskbar/types/taskbar.h
===================================================================
--- uspace/app/taskbar/types/taskbar.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/types/taskbar.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task Bar types
+ * @file Taskbar types
  */
 
@@ -46,5 +46,5 @@
 #include "wndlist.h"
 
-/** Task bar */
+/** Taskbar */
 typedef struct taskbar {
 	/** User interface */
Index: uspace/app/taskbar/types/tbsmenu.h
===================================================================
--- uspace/app/taskbar/types/tbsmenu.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/types/tbsmenu.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar start menu
+ * @file Taskbar start menu
  */
 
@@ -60,5 +60,5 @@
 } tbsmenu_entry_t;
 
-/** Task bar start menu */
+/** Taskbar start menu */
 typedef struct tbsmenu {
 	/** Containing window */
Index: uspace/app/taskbar/types/wndlist.h
===================================================================
--- uspace/app/taskbar/types/wndlist.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/types/wndlist.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar window list
+ * @file Taskbar window list
  */
 
@@ -61,5 +61,5 @@
 } wndlist_entry_t;
 
-/** Task bar window list */
+/** Taskbar window list */
 typedef struct wndlist {
 	/** Base control object */
Index: uspace/app/taskbar/wndlist.c
===================================================================
--- uspace/app/taskbar/wndlist.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/wndlist.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -30,5 +30,5 @@
  * @{
  */
-/** @file Task bar window list
+/** @file Taskbar window list
  */
 
@@ -80,5 +80,5 @@
 };
 
-/** Create task bar window list.
+/** Create taskbar window list.
  *
  * @param window Containing window
@@ -176,5 +176,5 @@
 }
 
-/** Destroy task bar window list.
+/** Destroy taskbar window list.
  *
  * @param wndlist Window list
Index: uspace/app/taskbar/wndlist.h
===================================================================
--- uspace/app/taskbar/wndlist.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/app/taskbar/wndlist.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar window list
+ * @file Taskbar window list
  */
 
Index: uspace/lib/tbarcfg/private/tbarcfg.h
===================================================================
--- uspace/lib/tbarcfg/private/tbarcfg.h	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/lib/tbarcfg/private/tbarcfg.h	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar configuration
+ * @file Taskbar configuration
  *
  */
@@ -42,5 +42,5 @@
 #include <types/tbarcfg/tbarcfg.h>
 
-/** Task bar configuration */
+/** Taskbar configuration */
 struct tbarcfg {
 	/** List of start menu entries (smenu_entry_t) */
Index: uspace/lib/tbarcfg/src/tbarcfg.c
===================================================================
--- uspace/lib/tbarcfg/src/tbarcfg.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/lib/tbarcfg/src/tbarcfg.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -31,5 +31,5 @@
  */
 /**
- * @file Task bar configuration
+ * @file Taskbar configuration
  */
 
@@ -41,8 +41,8 @@
 #include "../private/tbarcfg.h"
 
-/** Open task bar configuration.
+/** Open taskbar configuration.
  *
  * @param repopath Pathname of the menu repository
- * @param rtbcfg Place to store pointer to task bar configuration
+ * @param rtbcfg Place to store pointer to taskbar configuration
  * @return EOK on success or an error code
  */
@@ -116,5 +116,5 @@
 }
 
-/** Close task bar configuration.
+/** Close taskbar configuration.
  *
  * @param tbcfg Start menu
@@ -126,5 +126,5 @@
 /** Get first start menu entry.
  *
- * @param tbcfg Task bar configuration
+ * @param tbcfg Taskbar configuration
  * @return First entry or @c NULL if the menu is empty
  */
Index: uspace/lib/tbarcfg/test/tbarcfg.c
===================================================================
--- uspace/lib/tbarcfg/test/tbarcfg.c	(revision cb2894e55cad399c5f6a5b3b0e3a0e59833acac4)
+++ uspace/lib/tbarcfg/test/tbarcfg.c	(revision 2fbb42fc7cb049341ed2bb0ef644df1429f5fa15)
@@ -36,5 +36,5 @@
 PCUT_TEST_SUITE(tbarcfg);
 
-/** Opening and closing task bar configuration */
+/** Opening and closing taskbar configuration */
 PCUT_TEST(open_close)
 {