44 files changed, 44 insertions, 44 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index 1d5f7bf..c6ea2c6 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Battery Monitor applet
- Battery Monitor applet for the Qtopia environment taskbar.
+ Battery Monitor applet for the Opie environment taskbar.
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index d69b0e0..78c90b7 100644
--- a/core/applets/clipboardapplet/opie-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Clipboard applet
- Clipboard applet for the Qtopia environment taskbar.
+ Clipboard applet for the Opie environment taskbar.
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 5fb8bd5..958ac1c 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libclockapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Clock applet
- Clock applet for the Qtopia environment taskbar.
+ Clock applet for the Opie environment taskbar.
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index 1bc3aca..a65cf6d 100644
--- a/core/applets/volumeapplet/opie-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libvolumeapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Volume applet
- Volume applet for the Qtopia environment taskbar.
+ Volume applet for the Opie environment taskbar.
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index b087b9f..99a06eb 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -1,9 +1,9 @@
 Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole etc/keytabs/*
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), ptydevs
 Description: KDE's konsole (shell terminal)
- Ported to the Qtopia environment.
+ Ported to the Opie environment.
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index 91569ce..775c63f 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,10 +1,10 @@
 Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Browse HTML help documents
- The HTML help browser for the Qtopia environment.
+ The HTML help browser for the Opie environment.
diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control
index 113d40d..17e3985 100644
--- a/core/apps/qcop/opie-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -1,9 +1,9 @@
 Files: bin/qcop
 Priority: required
 Section: opie/system
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: qt-embedded (>=$QTE_VERSION)
 Description: Interprocess communication client
- Interprocess communication client for the Qtopia environment.
+ Interprocess communication client for the Opie environment.
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index e0a7b03..4990466 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,9 +1,9 @@
 Files: bin/textedit apps/Applications/textedit.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Text Editor
- The text editor for the Qtopia environment.
+ The text editor for the Opie environment.
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 0fa7ae8..53daa82 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
 Files: bin/qpe apps/Settings/Calibrate.desktop
 Priority: required
 Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: qt-embedded (>=$QTE_VERSION)
-Description: Launcher for QPE
+Description: Launcher for Opie
  The "finder" or "explorer", or whatever you want to call it.
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index ad3f49e..941047f 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
 Priority: optional
 Section: opie/plugins
 Maintainer: John Ryland <jryland@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: MP3 file plugin using libmad
- Plugin to play MP3 files with the mediaplayer in the Qtopia environment.
+ Plugin to play MP3 files with the mediaplayer in the Opie environment.
diff --git a/core/multimedia/opieplayer/opie-mpegplayer.control b/core/multimedia/opieplayer/opie-mpegplayer.control
index f98fdd3..34f1961 100644
--- a/core/multimedia/opieplayer/opie-mpegplayer.control
+++ b/core/multimedia/opieplayer/opie-mpegplayer.control
@@ -1,9 +1,9 @@
 Files: bin/mpegplayer pics/mpegplayer/* apps/Applications/mpegplayer.desktop plugins/codecs/libmpeg3plugin.so plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1.0.0
 Priority: optional
 Section: opie/applications
 Maintainer: John Ryland <jryland@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: MPEG video/audio player
- The mpegplayer for the Qtopia environment.
+ The mpegplayer for the Opie environment.
diff --git a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
index 31b1d49..99e1770 100644
--- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libwavplugin.so.1.0.0 plugins/codecs/libwavplugin.so.1.0 plugins/codecs/libwavplugin.so.1 plugins/codecs/libwavplugin.so
 Priority: optional
 Section: opie/plugins
 Maintainer: John Ryland <jryland@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: WAV file plugin
- Plugin to play WAV files with the mediaplayer in the Qtopia environment.
+ Plugin to play WAV files with the mediaplayer in the Opie environment.
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index a9bcc41..d2a7559 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,9 +1,9 @@
 Files: bin/addressbook apps/Applications/addressbook.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Contacts
- A simple addressbook for the Qtopia environment.
+ A simple addressbook for the Opie environment.
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index a3ca2b2..f322b49 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,9 +1,9 @@
 Files: bin/datebook apps/Applications/datebook.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: A datebook/appointment manager
- A datebook/appointment manager for the Qtopia environment.
+ A datebook/appointment manager for the Opie environment.
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 77f0746..cb9b110 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,9 +1,9 @@
 Files: bin/todolist apps/Applications/todo.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: TODO-list manager
- A Todo-list manager for the Qtopia environment.
+ A Todo-list manager for the Opie environment.
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 4a6b6de..82e891c 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -1,9 +1,9 @@
 Files: bin/citytime apps/Applications/citytime.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), timezones
 Description: Time-zone / world clock settings
- The time-zone manager for the Qtopia environment.
+ The time-zone manager for the Opie environment.
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index d3128c4..ae5c99c 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,9 +1,9 @@
 Files: bin/light-and-power apps/Settings/Light.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Light and Power settings dialog
- For the Qtopia environment.
+ For the Opie environment.
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index c6da693..e18ec1c 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -1,9 +1,9 @@
 Files: bin/security apps/Settings/Security.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Security settings dialog
- For the Qtopia environment.
+ For the Opie environment.
diff --git a/example/example.control b/example/example.control
index b0f267a..d6a4203 100644
--- a/example/example.control
+++ b/example/example.control
@@ -1,11 +1,11 @@
 Files: bin/example apps/Applications/example.desktop pics/Example.png
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: 1.0.0
 Depends: qpe-base ($QPE_VERSION)
 License: Public Domain
 Description: Example program
- An example program for the Qtopia environment.
+ An example program for the Opie environment.
  Does nothing interesting.
diff --git a/inputmethods/handwriting/opie-handwriting.control b/inputmethods/handwriting/opie-handwriting.control
index 84d8ef1..5245034 100644
--- a/inputmethods/handwriting/opie-handwriting.control
+++ b/inputmethods/handwriting/opie-handwriting.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqhandwriting.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Handwriting input method
- Handwriting recognition input method for the Qtopia environment.
+ Handwriting recognition input method for the Opie environment.
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index 76252cd..0b5f1e8 100644
--- a/inputmethods/keyboard/opie-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqkeyboard.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Keyboard input method
- Keyboard input method for the Qtopia environment.
+ Keyboard input method for the Opie environment.
diff --git a/inputmethods/pickboard/opie-pickboard.control b/inputmethods/pickboard/opie-pickboard.control
index 0d860a9..e08915e 100644
--- a/inputmethods/pickboard/opie-pickboard.control
+++ b/inputmethods/pickboard/opie-pickboard.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqpickboard.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Pickboard input method
- Pickboard dictionary-based input method for the Qtopia environment.
+ Pickboard dictionary-based input method for the Opie environment.
diff --git a/inputmethods/unikeyboard/opie-unikeyboard.control b/inputmethods/unikeyboard/opie-unikeyboard.control
index 11ce283..f2e804e 100644
--- a/inputmethods/unikeyboard/opie-unikeyboard.control
+++ b/inputmethods/unikeyboard/opie-unikeyboard.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqunikeyboard.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Unicode input method
- Basic unicode input method for the Qtopia environment.
+ Basic unicode input method for the Opie environment.
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index d96dddb..239593f 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -1,10 +1,10 @@
 Files: EXCLUDED bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: XML database browsers
- A table/database viewer for the Qtopia environment.
+ A table/database viewer for the Opie environment.
diff --git a/noncore/games/fifteen/opie-fifteen.control b/noncore/games/fifteen/opie-fifteen.control
index a89b666..6c0c590 100644
--- a/noncore/games/fifteen/opie-fifteen.control
+++ b/noncore/games/fifteen/opie-fifteen.control
@@ -1,11 +1,11 @@
 Files: bin/fifteen apps/Games/fifteen.desktop pics/Fifteen.png
 Priority: optional
 Section: qpe/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Fifteen pieces game
- A game for the Qtopia environment
+ A game for the Opie environment
 .
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control
index 865a5dc..b955f9a 100644
--- a/noncore/games/go/opie-go.control
+++ b/noncore/games/go/opie-go.control
@@ -1,9 +1,9 @@
 Files: bin/go apps/Games/go.desktop
 Priority: optional
 Section: qpe/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: The game of Go
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control
index 6346233..e472703 100644
--- a/noncore/games/mindbreaker/opie-mindbreaker.control
+++ b/noncore/games/mindbreaker/opie-mindbreaker.control
@@ -1,9 +1,9 @@
 Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: crack the coloured code
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index 4c7726e..4a79e99 100644
--- a/noncore/games/minesweep/opie-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -1,9 +1,9 @@
 Files: bin/minesweep apps/Games/minesweep.desktop
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: find the mines
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/parashoot/opie-parashoot.control b/noncore/games/parashoot/opie-parashoot.control
index 6c728bc..2429d90 100644
--- a/noncore/games/parashoot/opie-parashoot.control
+++ b/noncore/games/parashoot/opie-parashoot.control
@@ -1,9 +1,9 @@
 Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: shoot the parachutists
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control
index f02924b..b3f8df9 100644
--- a/noncore/games/qasteroids/opie-qasteroids.control
+++ b/noncore/games/qasteroids/opie-qasteroids.control
@@ -1,9 +1,9 @@
 Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids pics/Asteroids.png
 Priority: optional
 Section: opie/games
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: shoot the asteroids
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/snake/opie-snake.control b/noncore/games/snake/opie-snake.control
index 72d6b2d..acc5315 100644
--- a/noncore/games/snake/opie-snake.control
+++ b/noncore/games/snake/opie-snake.control
@@ -1,9 +1,9 @@
 Files: bin/snake apps/Games/snake.desktop pics/snake
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: control the snake
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control
index 79690b2..fe4cac9 100644
--- a/noncore/games/solitaire/opie-solitaire.control
+++ b/noncore/games/solitaire/opie-solitaire.control
@@ -1,9 +1,9 @@
 Files: bin/patience apps/Games/patience.desktop pics/cards
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: solitaire card games
- A solitaire game for the Qtopia environment.
+ A solitaire game for the Opie environment.
diff --git a/noncore/games/tetrix/opie-tetrix.control b/noncore/games/tetrix/opie-tetrix.control
index f5a08d7..8670106 100644
--- a/noncore/games/tetrix/opie-tetrix.control
+++ b/noncore/games/tetrix/opie-tetrix.control
@@ -1,10 +1,10 @@
 Files: bin/tetrix apps/Games/tetrix.desktop
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: control falling blocks
- A game for the Qtopia environment.
+ A game for the Opie environment.
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control
index 828a42e..0e28d37 100644
--- a/noncore/games/wordgame/opie-wordgame.control
+++ b/noncore/games/wordgame/opie-wordgame.control
@@ -1,10 +1,10 @@
 Files: bin/wordgame apps/Games/wordgame.desktop
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Crossword game
- A crossword game for the Qtopia environment.
+ A crossword game for the Opie environment.
  Play against the computer or human opponents.
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index ebd653f..a76aed8 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -1,10 +1,10 @@
 Files: bin/showimg apps/Applications/showimg.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Image Viewer
- The image viewer for the Qtopia environment. Supports
+ The image viewer for the Opie environment. Supports
  Whichever formats are compiled into Qt/Embedded (eg. PNG).
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control
index 5cd488c..842d2de 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -1,9 +1,9 @@
 Files: bin/language apps/Settings/Language.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Language settings dialog
- For the Qtopia environment.
+ For the Opie environment.
diff --git a/noncore/settings/sound/opie-sound.control b/noncore/settings/sound/opie-sound.control
index 9ac6977..a1fe50f 100644
--- a/noncore/settings/sound/opie-sound.control
+++ b/noncore/settings/sound/opie-sound.control
@@ -1,10 +1,10 @@
 Files: bin/sound apps/Settings/Sound.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Sound settings dialog
- For the Qtopia environment.
+ For the Opie environment.
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index 769e005..95acc92 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,9 +1,9 @@
 Files: bin/sysinfo apps/Applications/sysinfo.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: System Information dialog
- For the Qtopia environment.
+ For the Opie environment.
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index e8cf8dd..2d00abd 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,10 +1,10 @@
 Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Calculator
- A multi-function calculator for the Qtopia environment.
+ A multi-function calculator for the Opie environment.
  Includes units conversion.
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index 2f72d4c..8c6abb4 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -1,9 +1,9 @@
 Files: bin/clock apps/Applications/clock.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Clock and stop-watch
- A simple clock and stop-watch for the Qtopia environment.
+ A simple clock and stop-watch for the Opie environment.
diff --git a/noncore/unsupported/filebrowser/opie-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control
index b0e8f9e..012efe5 100644
--- a/noncore/unsupported/filebrowser/opie-filebrowser.control
+++ b/noncore/unsupported/filebrowser/opie-filebrowser.control
@@ -1,9 +1,9 @@
 Files: bin/filebrowser apps/Applications/filebrowser.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Browse the file system
- The filebrowser for the Qtopia environment.
+ The filebrowser for the Opie environment.
diff --git a/noncore/unsupported/oipkg/opie-qipkg.control b/noncore/unsupported/oipkg/opie-qipkg.control
index b89bc65..fc8a71e 100644
--- a/noncore/unsupported/oipkg/opie-qipkg.control
+++ b/noncore/unsupported/oipkg/opie-qipkg.control
@@ -1,9 +1,9 @@
 Files: bin/qipkg apps/Settings/qipkg.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Package Manager
- A GUI front-end to ipkg for the Qtopia environment.
+ A GUI front-end to ipkg for the Opie environment.
diff --git a/quickexec/opie-quickexec.control b/quickexec/opie-quickexec.control
index dad3fa4..1b7c90e 100644
--- a/quickexec/opie-quickexec.control
+++ b/quickexec/opie-quickexec.control
@@ -1,11 +1,11 @@
 Files: bin/quickexec
 Priority: required
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Calculator
- A multi-function calculator for the Qtopia environment.
+ A multi-function calculator for the Opie environment.
  Includes units conversion.
diff --git a/sounds/opie-sounds.control b/sounds/opie-sounds.control
index 620668c..1ee8ffe 100644
--- a/sounds/opie-sounds.control
+++ b/sounds/opie-sounds.control
@@ -1,8 +1,8 @@
 Files: sounds/*.wav
 Priority: required
 Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Description: Basic sounds for Qtopia environment
- These icons are available to all QPE application.
+ These icons are available to all Opie applications.