Openmoko: replace OpenMoko by Openmoko

93 files changed, 103 insertions, 103 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 65eb4c7c20..3bab952760 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -165,7 +165,7 @@ Recipes:    altboot, webcam-server
 
 Person:     Michael 'Mickey' Lauer
 Mail:       mlauer@vanille-media.de
-Distros:    OpenMoko, Ångström, Generic
+Distros:    Openmoko, Ångström, Generic
 Machines:   om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
 Interests:  Core OE infrastructure, everything Python, EFL, E17, Qt4
 Recipes:    *python*, efl/*, e17*
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index f8ea1ee5af..1fba9e6a74 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -1,7 +1,7 @@
 #@--------------------------------------------------------------------
 #@TYPE: Distribution
 #@NAME: MokoSlug <http://www.nslu2-linux.org>
-#@DESCRIPTION: The Linux Server companion for OpenMoko phones
+#@DESCRIPTION: The Linux Server companion for Openmoko phones
 #@MAINTAINER: Rod Whitby <rod@whitby.id.au>
 #@--------------------------------------------------------------------
 
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 434469dc74..73fcf20066 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: OpenMoko
-#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
+#@NAME: Openmoko
+#@DESCRIPTION: Linux Distribution Configuration for the Openmoko Platform
 #-----------------------------------------------------------------------------
 
 require conf/distro/include/preferred-om-2008-versions.inc
@@ -10,7 +10,7 @@ require conf/distro/include/angstrom-2007-for-openmoko.inc
 #
 # Header
 #
-DISTRO_NAME = "OpenMoko"
+DISTRO_NAME = "Openmoko"
 DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
diff --git a/contrib/qa/bugzilla.py b/contrib/qa/bugzilla.py
index 019b546a96..d1fd0d84c0 100644
--- a/contrib/qa/bugzilla.py
+++ b/contrib/qa/bugzilla.py
@@ -4,7 +4,7 @@
 #
 # This includes three test sites
 #   site contains one bug entry
-#   all_bugs contains all OpenMoko bugs as of \today
+#   all_bugs contains all Openmoko bugs as of \today
 #   no_bug  is a query which showed no bug
 #
 
diff --git a/packages/base-files/base-files/openmoko/issue b/packages/base-files/base-files/openmoko/issue
index fb0d224f9f..75124726f0 100644
--- a/packages/base-files/base-files/openmoko/issue
+++ b/packages/base-files/base-files/openmoko/issue
@@ -7,5 +7,5 @@
                 -'  |
                 '---'
 
-The OpenMoko Distribution -- powered by Angstrom \n \l
+The Openmoko Distribution -- powered by Angstrom \n \l
 
diff --git a/packages/base-files/base-files/openmoko/issue.net b/packages/base-files/base-files/openmoko/issue.net
index 1f19e8da8f..13050854cc 100644
--- a/packages/base-files/base-files/openmoko/issue.net
+++ b/packages/base-files/base-files/openmoko/issue.net
@@ -7,6 +7,6 @@
                 -'  |
                 '---'
 
-The OpenMoko Distribution -- powered by Angstrom %h
+The Openmoko Distribution -- powered by Angstrom %h
 
 
diff --git a/packages/images/minimal-openmoko-image.bb b/packages/images/minimal-openmoko-image.bb
index 6ab4935c24..70658fd86f 100644
--- a/packages/images/minimal-openmoko-image.bb
+++ b/packages/images/minimal-openmoko-image.bb
@@ -1,5 +1,5 @@
 #------------------------------------------------------
-# Minimal OpenMoko Image Recipe
+# Minimal Openmoko Image Recipe
 # This should only have the base system + dialer
 # #------------------------------------------------------
 
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 6600d8436c..48b0d7da4f 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -1,5 +1,5 @@
 #------------------------------------------------------
-# OpenMoko Image Recipe
+# Openmoko Image Recipe
 #------------------------------------------------------
 
 require openmoko-minimal-image.bb
diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb
index 15506c42e3..bb25df10a0 100644
--- a/packages/images/openmoko-minimal-image.bb
+++ b/packages/images/openmoko-minimal-image.bb
@@ -1,5 +1,5 @@
 #------------------------------------------------------
-# OpenMoko Minimal Image Recipe
+# Openmoko Minimal Image Recipe
 # other openmoko images should include this.
 # -----------------------------------------------------
 
diff --git a/packages/meta/openmoko-feed.bb b/packages/meta/openmoko-feed.bb
index b191f715c4..9cc227c62e 100644
--- a/packages/meta/openmoko-feed.bb
+++ b/packages/meta/openmoko-feed.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Meta-package for OpenMoko Misc. Feed Items"
+DESCRIPTION = "Meta-package for Openmoko Misc. Feed Items"
 LICENSE = "MIT"
 
 RDEPENDS = "\
diff --git a/packages/openmoko-apps/openmoko-appmanager_svn.bb b/packages/openmoko-apps/openmoko-appmanager_svn.bb
index a38341016b..7acc872bc1 100644
--- a/packages/openmoko-apps/openmoko-appmanager_svn.bb
+++ b/packages/openmoko-apps/openmoko-appmanager_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Application Manager"
+DESCRIPTION = "The Openmoko Application Manager"
 SECTION = "openmoko/applications"
 DEPENDS += "ipkg"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-calculator_svn.bb b/packages/openmoko-apps/openmoko-calculator_svn.bb
index 4650af0da0..39c180cc05 100644
--- a/packages/openmoko-apps/openmoko-calculator_svn.bb
+++ b/packages/openmoko-apps/openmoko-calculator_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Calculator Application"
+DESCRIPTION = "The Openmoko Calculator Application"
 SECTION = "openmoko/applications"
 AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo@free.fr>"
 
diff --git a/packages/openmoko-apps/openmoko-dialer_svn.bb b/packages/openmoko-apps/openmoko-dialer_svn.bb
index 04baaba393..8a0f3fd999 100644
--- a/packages/openmoko-apps/openmoko-dialer_svn.bb
+++ b/packages/openmoko-apps/openmoko-dialer_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Dialer"
+DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/applications"
 PV = "0.0.1+svnr${SRCREV}"
 
diff --git a/packages/openmoko-apps/openmoko-footer_svn.bb b/packages/openmoko-apps/openmoko-footer_svn.bb
index c606bb6be8..83ab7ab045 100644
--- a/packages/openmoko-apps/openmoko-footer_svn.bb
+++ b/packages/openmoko-apps/openmoko-footer_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Footer"
+DESCRIPTION = "The Openmoko Footer"
 SECTION = "openmoko/applications"
 PV = "0.0.1+svnr${SRCREV}"
 
diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
index b85411db3c..71a9f3cdb6 100644
--- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
+++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
@@ -7,8 +7,8 @@
 # Filename: openmoko-gps_svn.bb
 # Date: 20080101 (YMD)
 
-DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform."
-HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS"
+DESCRIPTION = "A tiny GPS output parser for the Openmoko platform."
+HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenmokoGPS"
 SECTION = "base"
 LICENSE = "GPL"
 
diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb
index 729cd4df80..a79353b603 100644
--- a/packages/openmoko-apps/openmoko-messages_svn.bb
+++ b/packages/openmoko-apps/openmoko-messages_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Messaging Application"
+DESCRIPTION = "The Openmoko Messaging Application"
 SECTION = "openmoko/applications"
 
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
index 2378c8ce44..c90d35e3d5 100644
--- a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
+++ b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Media Player"
+DESCRIPTION = "The Openmoko Media Player"
 SECTION = "openmoko/applications"
 DEPENDS += "alsa-lib dbus-glib id3lib libvorbis"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-taskmanager_svn.bb b/packages/openmoko-apps/openmoko-taskmanager_svn.bb
index f81bae1c88..e7725bee44 100644
--- a/packages/openmoko-apps/openmoko-taskmanager_svn.bb
+++ b/packages/openmoko-apps/openmoko-taskmanager_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Task Manager"
+DESCRIPTION = "The Openmoko Task Manager"
 SECTION = "openmoko/applications"
 PV = "0.0.1+svnr${SRCREV}"
 
diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb
index 85e8ea777f..1a33b03598 100644
--- a/packages/openmoko-apps/openmoko-terminal_svn.bb
+++ b/packages/openmoko-apps/openmoko-terminal_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Command Line Console"
+DESCRIPTION = "The Openmoko Command Line Console"
 SECTION = "openmoko/applications"
 RDEPENDS += "gtkterm2"
 PV = "1.0.0"
diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb
index 8dc1cae549..dc5d24abe1 100644
--- a/packages/openmoko-base/openmoko-common_svn.bb
+++ b/packages/openmoko-base/openmoko-common_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Common files for the OpenMoko distribution"
+DESCRIPTION = "Common files for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
 PR = "r1"
diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
index e98d0076c8..0961d74162 100644
--- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
 PR = "r1"
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index 128473eae3..1baa1d68b0 100644
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Matchbox session files for OpenMoko"
+DESCRIPTION = "Matchbox session files for Openmoko"
 SECTION = "openmoko/base"
 RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf"
 PV = "0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
index ddb5053f3e..67fe16c858 100644
--- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
+++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Sound System"
+DESCRIPTION = "Openmoko Sound System"
 SECTION = "openmoko/base"
 RDEPENDS = "\
   pulseaudio-server \
diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index 9ce0929f0d..bb500dbeb5 100644
--- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+DESCRIPTION = "Standard sound theme for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
 PR = "r2"
diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
index 0c2c8da9a8..5cb7042c92 100644
--- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
 PR = "r0"
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index 542e80fc7e..e5e54934dc 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
 PR = "r5"
diff --git a/packages/openmoko-examples/openmoko-finger-demo_svn.bb b/packages/openmoko-examples/openmoko-finger-demo_svn.bb
index 7d0af4c04f..5d55180aa1 100644
--- a/packages/openmoko-examples/openmoko-finger-demo_svn.bb
+++ b/packages/openmoko-examples/openmoko-finger-demo_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "An example finger application for OpenMoko"
+DESCRIPTION = "An example finger application for Openmoko"
 SECTION = "openmoko/examples"
 PV = "0.0.1+svnr${SRCREV}"
 
diff --git a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
index 0df3a1968a..2f87b0c41c 100644
--- a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
+++ b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A simple example panel plugin for OpenMoko"
+DESCRIPTION = "A simple example panel plugin for Openmoko"
 SECTION = "openmoko/examples"
 DEPENDS += "libmatchbox"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-examples/openmoko-panel-demo_svn.bb b/packages/openmoko-examples/openmoko-panel-demo_svn.bb
index 5c346f8bb9..bf2d306ca3 100644
--- a/packages/openmoko-examples/openmoko-panel-demo_svn.bb
+++ b/packages/openmoko-examples/openmoko-panel-demo_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "An example panel plugin for OpenMoko"
+DESCRIPTION = "An example panel plugin for Openmoko"
 SECTION = "openmoko/examples"
 DEPENDS += "libmatchbox"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
index 8701cc18e8..659f0c7636 100644
--- a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
+++ b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A simple stylus application example for OpenMoko"
+DESCRIPTION = "A simple stylus application example for Openmoko"
 SECTION = "openmoko/examples"
 PV = "0.0.1+svnr${SRCREV}"
 
diff --git a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb
index 6ba32215a5..4032cfceb6 100644
--- a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb
+++ b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "An example stylus application for OpenMoko"
+DESCRIPTION = "An example stylus application for Openmoko"
 SECTION = "openmoko/examples"
 PV = "0.0.1+svnr${SRCREV}"
 
diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
index 2231e22db1..e5dc9264d0 100644
--- a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
+++ b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork"
+DESCRIPTION = "Matchbox virtual keyboard for X11 - Openmoko fork"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "openmoko/inputmethods"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
index 38bab21c0e..c3ab1305e6 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
+DESCRIPTION = "Shows the battery/AC status in the Openmoko panel"
 DEPENDS = "apmd"
 PV = "0.1.0+svn${SVNREV}"
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
index abd2654ce9..336a7f8541 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
+DESCRIPTION = "Shows the bluetooth status in the Openmoko panel"
 DEPENDS = "bluez-libs libnotify"
 PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
index 3aa328a7cf..f5066b1c69 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the current time in the OpenMoko panel"
+DESCRIPTION = "Shows the current time in the Openmoko panel"
 PV = "0.1.0+svn${SVNREV}"
 
 inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
index fd2e9a1685..bf4eef5463 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the GPS status in the OpenMoko panel"
+DESCRIPTION = "Shows the GPS status in the Openmoko panel"
 DEPENDS = "gpsd"
 PV = "0.1.0+svn${SVNREV}"
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index a932473ed3..d90c6a4de7 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
+DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
 DEPENDS = "libgsmd libnotify"
 PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index 7ae04ca0a8..19c278596d 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Main menu applet for the OpenMoko panel"
+DESCRIPTION = "Main menu applet for the Openmoko panel"
 DEPENDS += "pulseaudio startup-notification"
 PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
index 8e8af7a086..2b1d2b03bd 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
+DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel"
 DEPENDS = "libnotify"
 RDEPENDS = "openmoko-dialer2"
 PV = "0.0.0+svn${SVNREV}"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
index eac9d0c211..5d00ab4b02 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "USB applet for the OpenMoko panel"
+DESCRIPTION = "USB applet for the Openmoko panel"
 PV = "0.1.0+svn${SVNREV}"
 
 inherit openmoko-panel-plugin
diff --git a/packages/openmoko-pim/openmoko-contacts_svn.bb b/packages/openmoko-pim/openmoko-contacts_svn.bb
index bdcbeaf519..49177e1c4d 100644
--- a/packages/openmoko-pim/openmoko-contacts_svn.bb
+++ b/packages/openmoko-pim/openmoko-contacts_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko address book"
+DESCRIPTION = "The Openmoko address book"
 LICENSE = "GPL"
 SECTION = "openmoko/pim"
 DEPENDS += "glib-2.0 gtk+ libglade eds-dbus gnome-vfs openmoko-libs"
diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb
index 7bfd42c3b6..b43b738131 100644
--- a/packages/openmoko-pim/openmoko-dates_svn.bb
+++ b/packages/openmoko-pim/openmoko-dates_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Dates Application"
+DESCRIPTION = "The Openmoko Dates Application"
 SECTION = "openmoko/pim"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
diff --git a/packages/openmoko-pim/openmoko-tasks_svn.bb b/packages/openmoko-pim/openmoko-tasks_svn.bb
index ca2385ff78..08acf4e9d3 100644
--- a/packages/openmoko-pim/openmoko-tasks_svn.bb
+++ b/packages/openmoko-pim/openmoko-tasks_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Tasks Application"
+DESCRIPTION = "The Openmoko Tasks Application"
 SECTION = "openmoko/pim"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb
index 4e2b2ef374..b26a2e8156 100644
--- a/packages/openmoko-pim/openmoko-today_svn.bb
+++ b/packages/openmoko-pim/openmoko-today_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Today application."
+DESCRIPTION = "Openmoko Today application."
 SECTION = "openmoko/pim"
 LICENSE = "GPL"
 DEPENDS = "openmoko-libs eds-dbus startup-notification"
diff --git a/packages/openmoko-tools/openmoko-chordmaster_svn.bb b/packages/openmoko-tools/openmoko-chordmaster_svn.bb
index 5dd6056239..9c6716c929 100644
--- a/packages/openmoko-tools/openmoko-chordmaster_svn.bb
+++ b/packages/openmoko-tools/openmoko-chordmaster_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A guitar chord database for OpenMoko"
+DESCRIPTION = "A guitar chord database for Openmoko"
 SECTION = "openmoko/tools"
 PV = "0.0.1+svn${SRCDATE}"
 
diff --git a/packages/openmoko2/openmoko-appearance_svn.bb b/packages/openmoko2/openmoko-appearance_svn.bb
index 1e8fe2e0bd..a6f5c11171 100644
--- a/packages/openmoko2/openmoko-appearance_svn.bb
+++ b/packages/openmoko2/openmoko-appearance_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Appearance Editor"
+DESCRIPTION = "The Openmoko Appearance Editor"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 gconf gtk+"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb
index 3929f7e964..c299564205 100644
--- a/packages/openmoko2/openmoko-appmanager2_svn.bb
+++ b/packages/openmoko2/openmoko-appmanager2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Application Manager"
+DESCRIPTION = "The Openmoko Application Manager"
 SECTION = "openmoko/applications"
 DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm ipkg"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
index b0b56d3e71..6d8349313f 100644
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Webbrowser"
+DESCRIPTION = "The Openmoko Webbrowser"
 SECTION = "openmoko/apps"
 DEPENDS += "intltool libmokoui2 check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
index 8e0c9ad6da..ba202bcec9 100644
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A Calculator for OpenMoko"
+DESCRIPTION = "A Calculator for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index b0aed4c0e0..0ea381437c 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Common files for the OpenMoko framework"
+DESCRIPTION = "Common files for the Openmoko framework"
 SECTION = "openmoko/base"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r0"
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index a6202e5284..ed6faf80be 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Address Book"
+DESCRIPTION = "The Openmoko Address Book"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
 RDEPENDS = "libedata-book"
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index f9c04f8f92..ff3bfa62a6 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Calendar"
+DESCRIPTION = "The Openmoko Calendar"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 7ef548bc15..7c6ea6b86e 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Dialer"
+DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index c9a36312cf..5fb7dab619 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Feed Reader"
+DESCRIPTION = "The Openmoko Feed Reader"
 SECTION = "openmoko/apps"
 DEPENDS += "libmokoui2 libmrss check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-firststart2_svn.bb b/packages/openmoko2/openmoko-firststart2_svn.bb
index 2796a60df2..ce2c181736 100644
--- a/packages/openmoko2/openmoko-firststart2_svn.bb
+++ b/packages/openmoko2/openmoko-firststart2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko First Start Wizard"
+DESCRIPTION = "The Openmoko First Start Wizard"
 SECTION = "openmoko/apps"
 DEPENDS += "libmokoui2 libglade"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index a02e05c1d2..acbf3da7b9 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework, QVGA edition"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework, QVGA edition"
 SECTION = "openmoko/base"
 DEPENDS = "imagemagick-native librsvg-native"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
index ddc87abced..e145fb2d98 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
 SECTION = "openmoko/base"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 4406c410dd..79a8163328 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A media player for OpenMoko"
+DESCRIPTION = "A media player for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
 RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
index 8ec0a9103a..59165f08c1 100644
--- a/packages/openmoko2/openmoko-messages2_svn.bb
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Message application"
+DESCRIPTION = "The Openmoko Message application"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb
index 9118f89e8a..b944e79b45 100644
--- a/packages/openmoko2/openmoko-sample2_svn.bb
+++ b/packages/openmoko2/openmoko-sample2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Sample Project"
+DESCRIPTION = "The Openmoko Sample Project"
 SECTION = "openmoko/applications"
 DEPENDS = "libmokoui2 intltool gconf"
 PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 507f85835e..0218f31949 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Custom Matchbox session files for OpenMoko"
+DESCRIPTION = "Custom Matchbox session files for Openmoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index ac281dad76..33cd5648d4 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Sound System"
+DESCRIPTION = "Openmoko Sound System"
 SECTION = "openmoko/base"
 RDEPENDS = "\
   pulseaudio-server \
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index f200b58cb2..3096da4813 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard sound theme for the OpenMoko framework"
+DESCRIPTION = "Standard sound theme for the Openmoko framework"
 SECTION = "openmoko/base"
 RREPLACES = "openmoko-sound-theme-standard"
 RPROVIDES = "openmoko-sound-theme-standard"
diff --git a/packages/openmoko2/openmoko-tasks2_svn.bb b/packages/openmoko2/openmoko-tasks2_svn.bb
index 48ec113884..b18c269814 100644
--- a/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Agenda"
+DESCRIPTION = "The Openmoko Agenda"
 SECTION = "openmoko/pim"
 DEPENDS = "dbus-glib eds-dbus libmokoui2"
 RDEPENDS = "libedata-cal"
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
index 2273ddd88f..b917c5ca84 100644
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Command Line Terminal"
+DESCRIPTION = "The Openmoko Command Line Terminal"
 SECTION = "openmoko/applications"
 DEPENDS = "vala-native vte libmokoui2"
 RDEPENDS = "ttf-liberation-mono"
diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
index ec0af53763..4a41079059 100644
--- a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework, QVGA edition"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 RPROVIDES = "openmoko-theme-standard-2"
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index a7812455cd..d4d23d11d6 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index baf60d877b..4b9f245c3c 100644
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Today2 vfolder files"
+DESCRIPTION = "The Openmoko Today2 vfolder files"
 SECTION = "openmoko/misc"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r3"
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index 998d22e308..efd281a95e 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Application Launcher"
+DESCRIPTION = "The Openmoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
diff --git a/packages/openmoko2/openmoko-worldclock2_svn.bb b/packages/openmoko2/openmoko-worldclock2_svn.bb
index 5857dde982..5b3956ee23 100644
--- a/packages/openmoko2/openmoko-worldclock2_svn.bb
+++ b/packages/openmoko2/openmoko-worldclock2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A World-Clock for OpenMoko"
+DESCRIPTION = "A World-Clock for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 libjana"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/settingsgui_0.7+0.8-beta.bb b/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
index 502fad7309..f0d6f84ce6 100644
--- a/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
+++ b/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Settings GUI"
+DESCRIPTION = "Openmoko Settings GUI"
 AUTHOR = "Kristian M."
 SECTION = "openmoko/applications"
 RDEPENDS = "python-pygtk python-subprocess python-threading"
diff --git a/packages/openmoko2/settingsgui_0.8.bb b/packages/openmoko2/settingsgui_0.8.bb
index 314348b0b8..e8ac48247c 100644
--- a/packages/openmoko2/settingsgui_0.8.bb
+++ b/packages/openmoko2/settingsgui_0.8.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Settings GUI"
+DESCRIPTION = "Openmoko Settings GUI"
 AUTHOR = "Kristian M."
 SECTION = "openmoko/applications"
 RDEPENDS = "python-pygtk python-subprocess python-threading"
diff --git a/packages/python/python-openmoko_0.1.bb b/packages/python/python-openmoko_0.1.bb
index 6755d4dca8..b55794598a 100644
--- a/packages/python/python-openmoko_0.1.bb
+++ b/packages/python/python-openmoko_0.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Python Bindings for the OpenMoko Platform"
+DESCRIPTION = "Python Bindings for the Openmoko Platform"
 AUTHOR = "Holger 'Zecke' Freyther"
 LICENSE = "LGPL"
 DEPENDS = "python-pygtk libmokoui2 libmokojournal2 libmokogsmd2"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index a55d5dd504..c378817d40 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -372,7 +372,7 @@ RDEPENDS_task-base-screen = "\
 	"
 
 #
-# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
+# GPE/OPIE/Openmoko provide own touchscreen calibration utils
 #
 RDEPENDS_task-base-touchscreen = "\
     tslib-tests \
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index c07ba1672f..3df3f1fd03 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
+DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
 PR = "r4"
diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb
index f46a3306fe..6924ff5388 100644
--- a/packages/tasks/task-nas-server.bb
+++ b/packages/tasks/task-nas-server.bb
@@ -56,7 +56,7 @@ RRECOMMENDS_task-nas-server-iptables = "\
 	kernel-module-ipt-masquerade \
 "
 
-DESCRIPTION_task-nas-server-openmoko = "NAS-Server: OpenMoko Support"
+DESCRIPTION_task-nas-server-openmoko = "NAS-Server: Openmoko Support"
 RDEPENDS_task-nas-server-openmoko = "\
 	dfu-util \
 "
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index 310d3f07c3..c3b119c845 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r72"
@@ -8,7 +8,7 @@ inherit task
 #
 # task-openmoko-base
 #
-DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
+DESCRIPTION_task-openmoko-base = "Openmoko: Top Panel, Application Launcher, Application Manager"
 RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
   matchbox-panel-2-applets \
diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 0c2342183e..964b623dca 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Debugging and Benchmarking Tools"
+DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r59"
diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb
index c5dbfb6f04..b8efd5e01e 100644
--- a/packages/tasks/task-openmoko-examples.bb
+++ b/packages/tasks/task-openmoko-examples.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Examples for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Examples for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r71"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index beb72cd4b0..989b9b5348 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Misc. Feed Items"
+DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r26"
diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb
index 0fdf3cac33..f2c5d6ff36 100644
--- a/packages/tasks/task-openmoko-games.bb
+++ b/packages/tasks/task-openmoko-games.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Games for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r71"
@@ -8,7 +8,7 @@ inherit task
 #
 # task-openmoko-games
 #
-DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+DESCRIPTION_task-openmoko-games = "Openmoko: Games"
 RDEPENDS_task-openmoko-games = "\
   oh-puzzles \
 "
diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb
index 59e6f24094..da787c62c0 100644
--- a/packages/tasks/task-openmoko-linux.bb
+++ b/packages/tasks/task-openmoko-linux.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Core system for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r71"
@@ -8,7 +8,7 @@ inherit task
 #
 # task-openmoko-core
 #
-DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
+DESCRIPTION_task-openmoko-linux = "Openmoko: Linux Core Services"
 RDEPENDS_task-openmoko-linux = "\
   task-base \
   netbase \
diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb
index 6a5c2c2aa5..56f6824df4 100644
--- a/packages/tasks/task-openmoko-native-sdk.bb
+++ b/packages/tasks/task-openmoko-native-sdk.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Native SDK"
+DESCRIPTION = "Openmoko: Native SDK"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r58"
diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb
index e75dc4b4ff..d58b05aa62 100644
--- a/packages/tasks/task-openmoko-net.bb
+++ b/packages/tasks/task-openmoko-net.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Networking for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Networking for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r71"
@@ -8,7 +8,7 @@ inherit task
 #
 # task-openmoko-net
 #
-DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
+DESCRIPTION_task-openmoko-net = "Openmoko: Linux Advanced Networking"
 RDEPENDS_task-openmoko-net = "\
   bluez-utils \
   bridge-utils \
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index 474efff79d..306ff058dd 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r73"
@@ -8,7 +8,7 @@ inherit task
 #
 # task-openmoko-phone
 #
-DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
+DESCRIPTION_task-openmoko-phone = "Openmoko: GSM and GPRS Phone Services"
 RDEPENDS_task-openmoko-phone = "\
   gsmd \
   libgsmd-tools \
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
index cef9a25931..eb3195dffb 100644
--- a/packages/tasks/task-openmoko-pim.bb
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: PIM for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r72"
@@ -8,7 +8,7 @@ inherit task
 #
 # task-openmoko-pim
 #
-DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
+DESCRIPTION_task-openmoko-pim = "Openmoko: Personal Information Management Suite"
 RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
   openmoko-calculator2 \
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
index a5baed0024..a493183865 100644
--- a/packages/tasks/task-openmoko-python-devel.bb
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Python Development Tools"
+DESCRIPTION = "Openmoko: Python Development Tools"
 SECTION = "openmoko/devel"
 LICENSE = "MIT"
 PR = "r3"
diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
index 788152c6ca..d243481010 100644
--- a/packages/tasks/task-openmoko-toolchain-host.bb
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -1,6 +1,6 @@
 require task-sdk-host.bb
 
-DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-openmoko-toolchain-target.bb b/packages/tasks/task-openmoko-toolchain-target.bb
index 281884d051..142990602c 100644
--- a/packages/tasks/task-openmoko-toolchain-target.bb
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
index 33eab591ed..2ef2a07504 100644
--- a/packages/tasks/task-openmoko-ui.bb
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: GUI for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PR = "r72"
@@ -10,7 +10,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
 #
 # task-openmoko-ui
 #
-DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
+DESCRIPTION_task-openmoko-ui = "Openmoko: The X11/Gtk+2 based native User Interface"
 PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
 RDEPENDS_task-openmoko-ui = "\
   gdk-pixbuf-loader-png \
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 730ea339aa..6c195ba078 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
diff --git a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
index 8c7ff5b94a..2610e16040 100644
--- a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>"
+AUTHOR = "Harald Welte <laforge@openmoko.org>, Openmoko <openmoko-kernel@lists.openmoko.org>"
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
index d8a51ea824..7e1bbc64e8 100644
--- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>"
+AUTHOR = "Harald Welte <laforge@openmoko.org>, Openmoko <openmoko-kernel@lists.openmoko.org>"
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"