Index: ipk/source/picons_KabelBW/CONTROL/control
===================================================================
--- ipk/source/picons_KabelBW/CONTROL/control	(revision 23660)
+++ ipk/source/picons_KabelBW/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-KabelBW
+Package: titan-plugin-picons-KabelBW
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_KabelDblack3d/CONTROL/control
===================================================================
--- ipk/source/picons_KabelDblack3d/CONTROL/control	(revision 23660)
+++ ipk/source/picons_KabelDblack3d/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-KabelDblack3d
+Package: titan-plugin-picons-KabelDblack3d
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_KabelDtransparent/CONTROL/control
===================================================================
--- ipk/source/picons_KabelDtransparent/CONTROL/control	(revision 23660)
+++ ipk/source/picons_KabelDtransparent/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-KabelDtransparent
+Package: titan-plugin-picons-KabelDtransparent
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_X_LightTransparent/CONTROL/control
===================================================================
--- ipk/source/picons_X_LightTransparent/CONTROL/control	(revision 23660)
+++ ipk/source/picons_X_LightTransparent/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-X.LightTransparent
+Package: titan-plugin-picons-X.LightTransparent
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_black3d/CONTROL/control
===================================================================
--- ipk/source/picons_black3d/CONTROL/control	(revision 23660)
+++ ipk/source/picons_black3d/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-black3d
+Package: titan-plugin-picons-black3d
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_black3d_SAT13/CONTROL/control
===================================================================
--- ipk/source/picons_black3d_SAT13/CONTROL/control	(revision 23660)
+++ ipk/source/picons_black3d_SAT13/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-black3d.Hotbird.13.0.E
+Package: titan-plugin-picons-black3d.Hotbird.13.0.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_black3d_SAT23_5/CONTROL/control
===================================================================
--- ipk/source/picons_black3d_SAT23_5/CONTROL/control	(revision 23660)
+++ ipk/source/picons_black3d_SAT23_5/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-black3d.Astra.23.5.E
+Package: titan-plugin-picons-black3d.Astra.23.5.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_gold/CONTROL/control
===================================================================
--- ipk/source/picons_gold/CONTROL/control	(revision 23660)
+++ ipk/source/picons_gold/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-gold.nugget
+Package: titan-plugin-picons-gold.nugget
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_gold_SAT13/CONTROL/control
===================================================================
--- ipk/source/picons_gold_SAT13/CONTROL/control	(revision 23660)
+++ ipk/source/picons_gold_SAT13/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-gold.nugget.Hotbird.13.0.E
+Package: titan-plugin-picons-gold.nugget.Hotbird.13.0.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_gold_SAT23_5/CONTROL/control
===================================================================
--- ipk/source/picons_gold_SAT23_5/CONTROL/control	(revision 23660)
+++ ipk/source/picons_gold_SAT23_5/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-gold.nugget.Astra.23.5.E
+Package: titan-plugin-picons-gold.nugget.Astra.23.5.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_gold_SAT28_2/CONTROL/control
===================================================================
--- ipk/source/picons_gold_SAT28_2/CONTROL/control	(revision 23660)
+++ ipk/source/picons_gold_SAT28_2/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-gold.nugget.Astra.28.2.E
+Package: titan-plugin-picons-gold.nugget.Astra.28.2.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_spiegel/CONTROL/control
===================================================================
--- ipk/source/picons_spiegel/CONTROL/control	(revision 23660)
+++ ipk/source/picons_spiegel/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-spiegel
+Package: titan-plugin-picons-spiegel
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_transparent/CONTROL/control
===================================================================
--- ipk/source/picons_transparent/CONTROL/control	(revision 23660)
+++ ipk/source/picons_transparent/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-transparent
+Package: titan-plugin-picons-transparent
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_transparent_SAT13/CONTROL/control
===================================================================
--- ipk/source/picons_transparent_SAT13/CONTROL/control	(revision 23660)
+++ ipk/source/picons_transparent_SAT13/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-transparent.Hotbird.13.0.E
+Package: titan-plugin-picons-transparent.Hotbird.13.0.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_transparent_SAT23_5/CONTROL/control
===================================================================
--- ipk/source/picons_transparent_SAT23_5/CONTROL/control	(revision 23660)
+++ ipk/source/picons_transparent_SAT23_5/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-transparent.Astra.23.5.E
+Package: titan-plugin-picons-transparent.Astra.23.5.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_transparent_SAT28_2/CONTROL/control
===================================================================
--- ipk/source/picons_transparent_SAT28_2/CONTROL/control	(revision 23660)
+++ ipk/source/picons_transparent_SAT28_2/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-transparent.Astra.28.2.E
+Package: titan-plugin-picons-transparent.Astra.28.2.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_transparent_small_black_19_2/CONTROL/control
===================================================================
--- ipk/source/picons_transparent_small_black_19_2/CONTROL/control	(revision 23660)
+++ ipk/source/picons_transparent_small_black_19_2/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-small.transparent
+Package: titan-plugin-picons-small.transparent
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white3d/CONTROL/control
===================================================================
--- ipk/source/picons_white3d/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white3d/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white3d
+Package: titan-plugin-picons-white3d
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white3d_SAT13/CONTROL/control
===================================================================
--- ipk/source/picons_white3d_SAT13/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white3d_SAT13/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white3d.Hotbird.13.0.E
+Package: titan-plugin-picons-white3d.Hotbird.13.0.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white3d_SAT23_5/CONTROL/control
===================================================================
--- ipk/source/picons_white3d_SAT23_5/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white3d_SAT23_5/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white3d.Astra.23.5.E
+Package: titan-plugin-picons-white3d.Astra.23.5.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white3d_SAT28_2/CONTROL/control
===================================================================
--- ipk/source/picons_white3d_SAT28_2/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white3d_SAT28_2/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white3d.Astra.28.2.E
+Package: titan-plugin-picons-white3d.Astra.28.2.E
 Version: 1.3
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white70/CONTROL/control
===================================================================
--- ipk/source/picons_white70/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white70/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white70
+Package: titan-plugin-picons-white70
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white70_SAT13/CONTROL/control
===================================================================
--- ipk/source/picons_white70_SAT13/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white70_SAT13/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white70.Hotbird.13.0.E
+Package: titan-plugin-picons-white70.Hotbird.13.0.E
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white70_SAT23_5/CONTROL/control
===================================================================
--- ipk/source/picons_white70_SAT23_5/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white70_SAT23_5/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white70.Astra.23.5.E
+Package: titan-plugin-picons-white70.Astra.23.5.E
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/picons_white70_SAT28_2/CONTROL/control
===================================================================
--- ipk/source/picons_white70_SAT28_2/CONTROL/control	(revision 23660)
+++ ipk/source/picons_white70_SAT28_2/CONTROL/control	(revision 23661)
@@ -1,7 +1,7 @@
-Package: titan-plugin-swappicons-white70.Astra.28.2.E
+Package: titan-plugin-picons-white70.Astra.28.2.E
 Version: 1.0
 Architecture: sh4
 OE: Picons
-Section: swappicons
+Section: picons
 Priority: optional
 Maintainer: AAF
Index: ipk/source/screensaver_default_1_0/CONTROL/control
===================================================================
--- ipk/source/screensaver_default_1_0/CONTROL/control	(revision 23660)
+++ ipk/source/screensaver_default_1_0/CONTROL/control	(revision 23661)
@@ -1,6 +1,6 @@
-Package: enigma2-plugin-swapscreensaver-default
+Package: enigma2-plugin-screensaver-default
 Version: 1.0
-Description: Screensaver pictures for AAF- MediaCenter Audioplayer and Radioplayer. SWAPSTICK IS NEEDED!
-Section: swapscreensaver
+Description: Screensaver pictures for AAF- MediaCenter Audioplayer and Radioplayer.
+Section: screensaver
 Priority: optional
 Maintainer: AAF Forum
Index: ipk/source/screensaver_fcbayern_1_0/CONTROL/control
===================================================================
--- ipk/source/screensaver_fcbayern_1_0/CONTROL/control	(revision 23660)
+++ ipk/source/screensaver_fcbayern_1_0/CONTROL/control	(revision 23661)
@@ -1,6 +1,6 @@
-Package: enigma2-plugin-swapscreensaver-fcbayern
+Package: enigma2-plugin-screensaver-fcbayern
 Version: 1.0
-Description: Screensaver FC Bayern pictures for AAF- MediaCenter Audioplayer and Radioplayer. SWAPSTICK IS NEEDED!
-Section: swapscreensaver
+Description: Screensaver FC Bayern pictures for AAF- MediaCenter Audioplayer and Radioplayer.
+Section: screensaver
 Priority: optional
 Maintainer: AAF Forum
Index: ipk/source/screensaver_hotgirls_1_0/CONTROL/control
===================================================================
--- ipk/source/screensaver_hotgirls_1_0/CONTROL/control	(revision 23660)
+++ ipk/source/screensaver_hotgirls_1_0/CONTROL/control	(revision 23661)
@@ -1,6 +1,6 @@
-Package: enigma2-plugin-swapscreensaver-hotgirls
+Package: enigma2-plugin-screensaver-hotgirls
 Version: 1.0
-Description: Screensaver Hot Girls pictures for AAF- MediaCenter Audioplayer and Radioplayer. SWAPSTICK IS NEEDED!
-Section: swapscreensaver
+Description: Screensaver Hot Girls pictures for AAF- MediaCenter Audioplayer and Radioplayer.
+Section: screensaver
 Priority: optional
 Maintainer: AAF Forum
Index: ipk/source/screensaver_radio_1.0/CONTROL/control
===================================================================
--- ipk/source/screensaver_radio_1.0/CONTROL/control	(revision 23660)
+++ ipk/source/screensaver_radio_1.0/CONTROL/control	(revision 23661)
@@ -1,6 +1,6 @@
-Package: enigma2-plugin-swapscreensaver-radio
+Package: enigma2-plugin-screensaver-radio
 Version: 1.0
-Description: Screensaver pictures for AAF- MediaCenter Audioplayer and Radioplayer. SWAPSTICK IS NEEDED!
-Section: swapscreensaver
+Description: Screensaver pictures for AAF- MediaCenter Audioplayer and Radioplayer.
+Section: screensaver
 Priority: optional
 Maintainer: AAF Forum