Index: /ipk/source.sh4/network_dlna/CONTROL/control
===================================================================
--- /ipk/source.sh4/network_dlna/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/network_dlna/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapnetwork-dlna
+Package: titan-plugin-network-dlna
 Version: 1.0
 Description: dlna Medien Server (upnp)
-Section: swapnetwork
+Section: network
 Priority: optional
 Maintainer: AAF Forum
@@ -11,3 +11,3 @@
 Source: http://www.aaf-digital.info
 Titanname: DLNA
-Showname: DLNA
+Showname: DLNA (Minidlna Server)
Index: /ipk/source.sh4/network_openvpn/CONTROL/control
===================================================================
--- /ipk/source.sh4/network_openvpn/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/network_openvpn/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapnetwork-openvpn
+Package: titan-plugin-network-openvpn
 Version: 1.0
-Description: Openvpn Tool  Config Pfad: /var/swap/etc/openvpn  Swapstick erforderlich!
-Section: swapnetwork
+Description: Openvpn Server Tool for external Network access
+Section: network
 Priority: optional
 Maintainer: AAF Forum
@@ -10,3 +10,3 @@
 Depends:
 Source: http://www.aaf-digital.info
-Showname: Open VPN
+Showname: Open VPN (Server)
Index: /ipk/source.sh4/network_samba/CONTROL/control
===================================================================
--- /ipk/source.sh4/network_samba/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/network_samba/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: enigma2-plugin-swapnetwork-samba
+Package: enigma2-plugin-network-samba
 Version: 3.028
 Description: Samba 
-Section: swapnetwork
+Section: network
 Priority: optional
 Maintainer: AAF Forum
@@ -10,3 +10,3 @@
 Depends:
 Source: http://www.aaf-digital.info
-Showname: Samba
+Showname: Samba (Server)
Index: /ipk/source.sh4/networklib_libsmbclient_3_0_28b/CONTROL/control
===================================================================
--- /ipk/source.sh4/networklib_libsmbclient_3_0_28b/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/networklib_libsmbclient_3_0_28b/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: enigma2-plugin-swapnetwork-libsmbclient3.0.28b
+Package: enigma2-plugin-network-libsmbclient3.0.28b
 Version: 3.0.28b
-Description: Networkfile libsmbclient 3.0.28b for swapstick
-Section: swapnetwork
+Description: Networkfile libsmbclient 3.0.28b
+Section: network
 Priority: optional
 Maintainer: AAF Forum
@@ -10,4 +10,4 @@
 Depends:
 Source: http://www.aaf-digital.info
-Showname: SMB Client Lib v3.0.28b
+Showname: SMB Client Lib v3.0.28b (/media/smbfs)
 Usepath: /var/swap,/mnt/swapextensions
Index: /ipk/source.sh4/tools_callmonitor/CONTROL/control
===================================================================
--- /ipk/source.sh4/tools_callmonitor/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/tools_callmonitor/CONTROL/control	(revision 23660)
@@ -1,7 +1,7 @@
-Package: plugin-tools-callmonitor
+Package: titan-plugin-tools-callmonitor
 Version: 2.0
 Architecture: sh4
 OE: Callmonitor
-Section: swaptools
+Section: tools
 Priority: optional
 Maintainer: AAF
Index: /ipk/source.sh4/tools_lcdpearl1/CONTROL/control
===================================================================
--- /ipk/source.sh4/tools_lcdpearl1/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/tools_lcdpearl1/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: plugin-tools-pearllcd
+Package: titan-plugin-tools-pearllcd
 Version: 4.0
 Description: Treiber fuer Pearl LCD V4.0
-Section: swaptools
+Section: tools
 Priority: optional
 Maintainer: AAF Forum
Index: /ipk/source.sh4/tools_lcdsamsung/CONTROL/control
===================================================================
--- /ipk/source.sh4/tools_lcdsamsung/CONTROL/control	(revision 23659)
+++ /ipk/source.sh4/tools_lcdsamsung/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: plugin-tools-samsunglcd
+Package: titan-plugin-tools-samsunglcd
 Version: 2.0
 Description: Treiber fuer Samsung LCD
-Section: swaptools
+Section: tools
 Priority: optional
 Maintainer: AAF Forum
Index: /ipk/source/skins_MetrixHD/CONTROL/control
===================================================================
--- /ipk/source/skins_MetrixHD/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_MetrixHD/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapskins-MetrixHD
+Package: titan-plugin-skins-MetrixHD
 Version: 1.0
-Description: !!!BETA!!!BETA!!! MetrixHD swap skin for TitanNit. Use transparent XPicons.
-Section: swapskins
+Description: !!!BETA!!!BETA!!! MetrixHD skin for TitanNit. Use transparent XPicons.
+Section: skins
 Priority: optional
 Maintainer: AAF Forum
Index: /ipk/source/skins_cool/CONTROL/control
===================================================================
--- /ipk/source/skins_cool/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_cool/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapskins-cool
+Package: titan-plugin-skins-cool
 Version: 1.12
 Description: cool Skin. Please use cool Picons.
-Section: swapskins
+Section: skins
 Priority: optional
 Maintainer: AAF Forum
Index: /ipk/source/skins_coolMiniTV/CONTROL/control
===================================================================
--- /ipk/source/skins_coolMiniTV/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_coolMiniTV/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapskins-coolMiniTV
+Package: titan-plugin-skins-coolMiniTV
 Version: 1.12
 Description: coolMiniTV Skin. 
-Section: swapskins
+Section: skins
 Priority: optional
 Maintainer: AAF Forum
Index: /ipk/source/skins_default/CONTROL/control
===================================================================
--- /ipk/source/skins_default/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_default/CONTROL/control	(revision 23660)
@@ -1,5 +1,5 @@
 Package: titan-plugin-skins-default
 Version: 1.0
-Description: Skin Default in black for tiTan. Please use black Picons.
+Description: Standard Skin für TitanNit.
 Section: skins
 Priority: optional
@@ -10,3 +10,3 @@
 Depends:
 Source: http://www.aaf-digital.info
-Showname: Skin Default (schwarz)
+Showname: Skin Default
Index: /ipk/source/skins_smartTV/CONTROL/control
===================================================================
--- /ipk/source/skins_smartTV/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_smartTV/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapskins-smartTV
+Package: titan-plugin-skins-smartTV
 Version: 1.12
 Description: smartTV Skin. Please use alternate Picons.
-Section: swapskins
+Section: skins
 Priority: optional
 Maintainer: AAF Forum
Index: /ipk/source/skins_titan/CONTROL/control
===================================================================
--- /ipk/source/skins_titan/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_titan/CONTROL/control	(revision 23660)
@@ -10,3 +10,3 @@
 Depends:
 Source: http://www.aaf-digital.info
-Showname: Skin Default (alt)
+Showname: Skin Enigma2 Design
Index: /ipk/source/skins_titan_grey/CONTROL/control
===================================================================
--- /ipk/source/skins_titan_grey/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_titan_grey/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapskins-titangrey
+Package: titan-plugin-skins-titangrey
 Version: 1.12
-Description: old default_grey Skin for your AAF-Duckbox. SWAPSTICK IS NEEDED!
-Section: swapskins
+Description: old default_grey Skin for your AAF-Duckbox.
+Section: skins
 Priority: optional
 Maintainer: AAF Forum
@@ -10,3 +10,3 @@
 Depends:
 Source: http://www.aaf-digital.info
-Showname: Skin Default (grau)
+Showname: Skin Enigma2 Design (grau)
Index: /ipk/source/skins_ufs912/CONTROL/control
===================================================================
--- /ipk/source/skins_ufs912/CONTROL/control	(revision 23659)
+++ /ipk/source/skins_ufs912/CONTROL/control	(revision 23660)
@@ -1,6 +1,6 @@
-Package: titan-plugin-swapskins-ufs912
+Package: titan-plugin-skins-ufs912
 Version: 1.13
-Description: Swapskin ufs912 for tiTan. Use white Picons.
-Section: swapskins
+Description: Skin ufs912 for tiTan. Use white Picons.
+Section: skins
 Priority: optional
 Maintainer: big thx mike99