58 files changed, 393 insertions, 373 deletions
diff --git a/noncore/settings/networksettings2/activateprofile.cpp b/noncore/settings/networksettings2/activateprofile.cpp
index e4064e3..fe98fc4 100644
--- a/noncore/settings/networksettings2/activateprofile.cpp
+++ b/noncore/settings/networksettings2/activateprofile.cpp
@@ -1,31 +1,31 @@
 #include <qlistbox.h>
 #include <qlabel.h>
 #include "activateprofile.h"
 ActivateProfile::ActivateProfile( const char * Interface ) :
        ActivateProfileGUI( 0, 0, TRUE ), NSD() {
    Possible = NSD.collectPossible( Interface );
    DeviceName_LBL->setText( Interface );
    Profiles_LB->clear();
-    for( NodeCollection * NC = Possible.first();
+    for( NetworkSetup * NC = Possible.first();
         NC;
         NC = Possible.next() ) {
      Profiles_LB->insertItem( NC->devicePixmap(), 
                               NC->name() );
    }
 }
 ActivateProfile::~ActivateProfile( void ) {
 }
 long ActivateProfile::selectedProfile( void ) {
    for( unsigned int i = 0 ; i < Profiles_LB->count(); i ++ ) {
      if( Profiles_LB->isSelected(i) ) {
        return Possible.at(i)->number();
      }
    }
    return -1;
 }
diff --git a/noncore/settings/networksettings2/activateprofile.h b/noncore/settings/networksettings2/activateprofile.h
index dedeb51..385c665 100644
--- a/noncore/settings/networksettings2/activateprofile.h
+++ b/noncore/settings/networksettings2/activateprofile.h
@@ -1,19 +1,19 @@
 #include "activateprofileGUI.h"
 #include "nsdata.h"
 class ActivateProfile : public ActivateProfileGUI {
      Q_OBJECT
 public :
      ActivateProfile( const char * interface );
      ~ActivateProfile( void );
      long selectedProfile( void );
 private :
      NetworkSettingsData NSD;
-      QList<NodeCollection> Possible;
+      QList<NetworkSetup> Possible;
 };
diff --git a/noncore/settings/networksettings2/activatevpn.cpp b/noncore/settings/networksettings2/activatevpn.cpp
index 768a031..35a881b 100644
--- a/noncore/settings/networksettings2/activatevpn.cpp
+++ b/noncore/settings/networksettings2/activatevpn.cpp
@@ -1,48 +1,48 @@
 #include <qlistview.h>
 #include <qheader.h>
 #include <resources.h>
 #include "activatevpn.h"
 class MyCheckListItem : public QCheckListItem {
 public :
-      MyCheckListItem( NodeCollection * N, QListView * V );
+      MyCheckListItem( NetworkSetup * N, QListView * V );
-      NodeCollection * NC;
+      NetworkSetup * NC;
 };
-MyCheckListItem::MyCheckListItem( NodeCollection * N, QListView * V ):
+MyCheckListItem::MyCheckListItem( NetworkSetup * N, QListView * V ):
                QCheckListItem( V, N->name() ) {
      NC = N;
 }
 ActivateVPN::ActivateVPN( const QString & I ) :
                  ActivateVPNGUI( 0, 0, TRUE ), NSD() {
    QCheckListItem * CI;
    VPN_LV->clear();
    VPN_LV->header()->hide();
-    // find all connections that want to be triggered by this interface
+    // find all NetworkSetups that want to be triggered by this interface
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
         it.current();
         ++it ) {
      if( it.current()->triggeredBy( I ) ) {
        CI = new MyCheckListItem( it.current(), VPN_LV );
      }
    }
 }
 ActivateVPN::~ActivateVPN( void ) {
 }
 void ActivateVPN::SLOT_ChangedVPNSetting( QListViewItem * I ) {
      MyCheckListItem * MI = (MyCheckListItem *)I;
      printf( "%s : %d\n", 
          MI->text(0).latin1(),
          MI->isOn() );
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
index 5c937a1..5c71a0a 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp
@@ -1,165 +1,165 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <resources.h>
 #include "bluetoothBNEPrun.h"
 using Opietooth2::OTGateway;
-using Opietooth2::OTPANConnection;
+using Opietooth2::OTPANNetworkSetup;
-using Opietooth2::PANConnectionVector;
+using Opietooth2::PANNetworkSetupVector;
 BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, 
                  BluetoothBNEPData & D ) : 
                  RuntimeInfo( NNI ),
                  Data( D),
                  Pat( "bnep[0-6]" ) {
    OT = 0;
 }
 BluetoothBNEPRun::~BluetoothBNEPRun( void ) {
    if( OT ) {
      OTGateway::releaseOTGateway();
    }
 }
 State_t BluetoothBNEPRun::detectState( void ) { 
    /*
        need to detect 
-        1. for any PAN connection that is found if that
+        1. for any PAN NetworkSetup that is found if that
           PAN is connected.
           if it is connected it is not available (since we do
           not manage IP settings and we are called to detect
-           the state we knwo that we do not have an UP connection)
+           the state we knwo that we do not have an UP NetworkSetup)
-        2. if it not connected and we allow any connection we
+        2. if it not connected and we allow any NetworkSetup we
-           are available or if that PAN connection is to a device
+           are available or if that PAN NetworkSetup is to a device
           with a correct address
        3. if it is not connected and the address do not match or
           we do not accept any address, we are Unavailable but
-           not DOWN.  I.e a new connection could perhaps be created
+           not DOWN.  I.e a new NetworkSetup could perhaps be created
    */
    if( ! OT ) {
      OT = OTGateway::getOTGateway();
    }
    if( ! OT->isEnabled() ) {
      return Unavailable;
    }
-    // if there is a PAN connection that is UP but not
+    // if there is a PAN NetworkSetup that is UP but not
    // yet configured (no ifup) the we are available
-    return ( hasFreePANConnection() ) ?  Available : Unknown;
+    return ( hasFreePANNetworkSetup() ) ?  Available : Unknown;
 }
-QString BluetoothBNEPRun::setMyState( NodeCollection * NC, Action_t A, bool  ) {
+QString BluetoothBNEPRun::setMyState( NetworkSetup * NC, Action_t A, bool  ) {
    if( A == Activate ) {
-      if( hasFreePANConnection( 1 ) ) {
+      if( hasFreePANNetworkSetup( 1 ) ) {
        // we have now an assignedinterface
      } else {
        return QString("TODO : Start PAND");
      }
      Log(( "Assigned interface" ));
      NC->setCurrentState( Available );
      return QString();
    }
    if( A == Deactivate ) {
      // nothing to do 
      NC->setCurrentState( Off );
      return QString();
    }
    return QString();
 }
 bool BluetoothBNEPRun::handlesInterface( const QString & S ) {
    return Pat.match( S ) >= 0;
 }
 bool BluetoothBNEPRun::handlesInterface( InterfaceInfo * I ) {
    return handlesInterface( I->Name );
 }
-bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
+bool BluetoothBNEPRun::hasFreePANNetworkSetup( bool Grab ) {
    if( ! OT ) {
      OT = OTGateway::getOTGateway();
    }
-    // load PAN connections
+    // load PAN NetworkSetups
-    OTPANConnection * C;
+    OTPANNetworkSetup * C;
    InterfaceInfo * Run;
    InterfaceInfo * Candidate = 0; // reuse this interface
-    PANConnectionVector Conns = OT->getPANConnections();
+    PANNetworkSetupVector Conns = OT->getPANNetworkSetups();
    System & Sys = NSResources->system();
    bool IsValid;
    for( unsigned int i = 0;
         i < Conns.count();
         i ++ ) {
      C = Conns[i];
      if( Data.AllowAll ) {
        // we allow all
        IsValid = 1;
      } else {
-        // is this PAN connection connecting to a Peer
+        // is this PAN NetworkSetup connecting to a Peer
        // we allow ?
        IsValid = 0;
        for ( QStringList::Iterator it = Data.BDAddress.begin(); 
              it != Data.BDAddress.end(); 
              ++ it ) {
          if( C->ConnectedTo == (*it) ) {
-            // this is a connection we could accept
+            // this is a NetworkSetup we could accept
            IsValid = 1;
            break;
          }
        }
      }
      if( ! IsValid ) {
        Log(("%s to %s not acceptable\n",
            C->Device.latin1(),
            C->ConnectedTo.latin1() ));
        // don't bother checking this address
        // it is not acceptable
        continue;
      }
-      // is this PAN connection available to us ?
+      // is this PAN NetworkSetup available to us ?
      Run = Sys.findInterface( C->Device );
      if( Run && Run->IsUp ) {
-        // this PAN connection is up
+        // this PAN NetworkSetup is up
        Log(("%s acceptable but unavailable\n",
            C->Device.latin1() ));
        // find others
        continue;
      }
      // we at least have a possible interface
      if( ! Candidate ) {
        Candidate = Run;
      }
    }
    if( Candidate ) {
      if ( Grab ) {
-        netNode()->connection()->assignInterface( Candidate );
+        netNode()->networkSetup()->assignInterface( Candidate );
      }
      return 1;
    }
    // no free PAN
    return 0;
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
index 8551a2e..7346a8d 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
@@ -1,34 +1,34 @@
 #include <netnode.h>
 #include "bluetoothBNEPdata.h"
 #include <OTGateway.h>
 class BluetoothBNEPRun  : public RuntimeInfo {
 public :
      BluetoothBNEPRun( ANetNodeInstance * NNI, 
                        BluetoothBNEPData & D );
      virtual ~BluetoothBNEPRun( void );
      // i am a device
      virtual RuntimeInfo * device( void ) 
        { return this; }
      bool handlesInterface( const QString & );
      bool handlesInterface( InterfaceInfo * );
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
-      bool hasFreePANConnection( bool Grab = 0 );
+      bool hasFreePANNetworkSetup( bool Grab = 0 );
      BluetoothBNEPData &         Data;
      Opietooth2::OTGateway *     OT;
      QRegExp                     Pat;
 };
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
index 3df7f5c..cd7bb4a 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp
@@ -1,97 +1,97 @@
 #include <qapplication.h>
 #include <resources.h>
 #include <OTDevice.h>
 #include <OTGateway.h>
 #include "bluetoothRFCOMMrun.h"
 using Opietooth2::OTGateway;
 using Opietooth2::OTDevice;
 using Opietooth2::OTDeviceAddress;
 BluetoothRFCOMMRun::~BluetoothRFCOMMRun( void ) {
      if( OT ) {
        OTGateway::releaseOTGateway();
      }
 }
 State_t BluetoothRFCOMMRun::detectState( void ) {
      if( ! OT ) {
        OT = OTGateway::getOTGateway();
      }
-      if( deviceNrOfConnection() >= 0 ) {
+      if( deviceNrOfNetworkSetup() >= 0 ) {
        return Available;
      }
      odebug << "Bluetooth " 
            << OT->isEnabled()
            << oendl;
      return ( OT->isEnabled() ) ? Off : Unavailable;
 }
-QString BluetoothRFCOMMRun::setMyState( NodeCollection *, 
+QString BluetoothRFCOMMRun::setMyState( NetworkSetup *, 
                                      Action_t A, 
                                      bool ) {
      if( OT ) {
        OTGateway::getOTGateway();
      }
      if( A == Activate ) {
        // from OFF to Available
        RFCOMMChannel * Ch = getChannel( );
        System & Sys = NSResources->system();
 
        if( Ch ) {
          // connect to this peer
          DeviceNr = OT->getFreeRFCommDevice();
          QStringList S;
          S << "rfcomm" 
            << "bind"
            << QString().setNum( DeviceNr )
            << Ch->BDAddress
            << QString().setNum( Ch->Channel );
 
          if( Sys.runAsRoot( S ) ) {
            return QString( "Error starting %1").arg(S.join(" "));
          }
          // here rfcomm should be running -> we will detect state later
          return QString();
        } else {
          Log(( "No channel selected -> cancel\n" ));
          return QString( "No channel selected. Operation cancelled" );
        }
      }
      if( A == Deactivate ) {
        if( DeviceNr >= 0 ) {
          if( OT->releaseRFCommDevice( DeviceNr ) ) {
-           return QString( "Cannot release RFCOMM connection" );
+           return QString( "Cannot release RFCOMM NetworkSetup" );
          }
          DeviceNr = -1;
        }
      }
      return QString();
 }
 #include <qlistbox.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qdialog.h>
 RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
    if( Data->Devices.count() == 1 ) {
      // only one device -> return channel
      return Data->Devices[0];
    }
    RFCOMMChannel * Ch = 0;
    QDialog * Dlg = new QDialog( qApp->mainWidget(), 0, TRUE );
    QVBoxLayout * V = new QVBoxLayout( Dlg );
@@ -110,55 +110,55 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
    V->addWidget( L );
    V->addWidget( LB );
    Dlg->resize( 100, 100 );
    Dlg->move( 20, 
               (qApp->desktop()->height()-100)/2 );
    if( Dlg->exec() == QDialog::Accepted ) {
      unsigned int i = 0;
      for( i = 0; i < Data->Devices.count(); i ++ ) {
        if( LB->isSelected(i) ) {
          odebug << "Selected " << Data->Devices[i]->Name << oendl;
          Ch = Data->Devices[i];
          break;
        }
      }
    }
    delete Dlg;
    return Ch;
 }
 QString BluetoothRFCOMMRun::deviceFile( void ) {
-    if( deviceNrOfConnection() >= 0 ) {
+    if( deviceNrOfNetworkSetup() >= 0 ) {
      OTDevice * OTD = OT->getOTDevice();
-      // there is a connection
+      // there is a NetworkSetup
      return OTD->getRFCommDevicePattern().arg(DeviceNr);
    }
    return QString();
 }
-int BluetoothRFCOMMRun::deviceNrOfConnection( void ) {
+int BluetoothRFCOMMRun::deviceNrOfNetworkSetup( void ) {
    if( ! OT ) {
      OT = OTGateway::getOTGateway();
    }
    DeviceNr = -1;
    for( unsigned int i = 0; i < Data->Devices.count(); i ++ ) {
      odebug << "Check for rfcomm on " 
            << Data->Devices[i]->BDAddress
            << " "
            << Data->Devices[i]->Channel
            << oendl;
      if( ( DeviceNr = OT->connectedToRFCommChannel( 
              OTDeviceAddress( Data->Devices[i]->BDAddress ),
              Data->Devices[i]->Channel ) ) >= 0 ) {
        odebug << "Up " 
              << oendl;
        break;
      }
    }
    return DeviceNr;
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
index 5a31a94..32986d3 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
@@ -1,32 +1,32 @@
 #include <netnode.h>
 #include "bluetoothRFCOMMdata.h"
 #include <OTGateway.h>
 class BluetoothRFCOMMRun  : public RuntimeInfo {
 public :
      BluetoothRFCOMMRun( ANetNodeInstance * NNI, 
                          BluetoothRFCOMMData & D ) : RuntimeInfo( NNI )
        {  DeviceNr = -1; Data = &D; OT = 0; }
      virtual ~BluetoothRFCOMMRun( void );
      virtual RuntimeInfo * line( void ) 
        { return this; }
      virtual QString deviceFile( void );
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
-      int deviceNrOfConnection( void );
+      int deviceNrOfNetworkSetup( void );
      RFCOMMChannel * getChannel( void );
      BluetoothRFCOMMData *   Data;
      Opietooth2::OTGateway * OT;
      int                     DeviceNr; // cached from detection
 };
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index 58237a1..3f34bb2 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -1,42 +1,42 @@
 #include "cable_NN.h"
 #include "cable_NNI.h"
 #include "netnodeinterface.h"
 static const char * CableNeeds[] = 
    { 0
    };
 static const char * CableProvides[] = 
    { "line",
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
-CableNetNode::CableNetNode() : ANetNode(tr("Cable Connection")) {
+CableNetNode::CableNetNode() : ANetNode(tr("Cable NetworkSetup")) {
 }
 /**
 * Delete any interfaces that we own.
 */
 CableNetNode::~CableNetNode(){
 }
 const QString CableNetNode::nodeDescription(){
      return tr("\
 <p>Sets up a wired serial or parallel.</p>\
 "
 );
 }
 ANetNodeInstance * CableNetNode::createInstance( void ) {
      return new ACable( this );
 }
 const char ** CableNetNode::needs( void ) {
      return CableNeeds;
 }
 const char ** CableNetNode::provides( void ) {
diff --git a/noncore/settings/networksettings2/cable/cablerun.cpp b/noncore/settings/networksettings2/cable/cablerun.cpp
index 7a8deb9..edbeb89 100644
--- a/noncore/settings/networksettings2/cable/cablerun.cpp
+++ b/noncore/settings/networksettings2/cable/cablerun.cpp
@@ -1,22 +1,22 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "cablerun.h"
 State_t CableRun::detectState( void ) { 
      int fd = open( Data->Device.latin1(), O_RDWR );
      if( fd < 0 ) {
        return Unavailable;
      }
      close( fd );
      return Available;
 }
-QString CableRun::setMyState( NodeCollection *, Action_t , bool ) { 
+QString CableRun::setMyState( NetworkSetup *, Action_t , bool ) { 
      return QString();
 }
 QString CableRun::deviceFile( void ) {
      return Data->Device;
 }
diff --git a/noncore/settings/networksettings2/cable/cablerun.h b/noncore/settings/networksettings2/cable/cablerun.h
index 41aea01..6a457c4 100644
--- a/noncore/settings/networksettings2/cable/cablerun.h
+++ b/noncore/settings/networksettings2/cable/cablerun.h
@@ -1,26 +1,26 @@
 #include <netnode.h>
 #include "cabledata.h"
 class CableRun  : public RuntimeInfo {
 public :
      CableRun( ANetNodeInstance * NNI, 
                CableData & D ) : RuntimeInfo( NNI )
        { Data = &D; }
      virtual RuntimeInfo * line( void ) 
        { return this; }
      virtual QString deviceFile( void );
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      CableData * Data;
 };
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index 717d9e9..6ab2dd6 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -64,83 +64,85 @@ public:
      QListViewItem( parent, S ) { }
    virtual void paintCell( QPainter *p, const QColorGroup &cg,
                            int column, int width, int alignment );
 };
 void MyQListViewItem::paintCell( QPainter *p, const QColorGroup &cg,
                                 int column, int width, int alignment )
 {
    QColorGroup _cg( cg );
    QColor c = _cg.text();
    if ( ! isSelectable() )
        _cg.setColor( QColorGroup::Text, Qt::lightGray );
    QListViewItem::paintCell( p, _cg, column, width, alignment );
    _cg.setColor( QColorGroup::Text, c );
 }
 //
 //
 // REAL GUI
 //
 //
-bool EditConnection::AutoCollapse = 1;
+bool EditNetworkSetup::AutoCollapse = 1;
-EditConnection::EditConnection( QWidget* parent ) :
+EditNetworkSetup::EditNetworkSetup( QWidget* parent ) :
-      EditConnectionGUI( parent, 0, TRUE ), TmpCollection() {
+      EditNetworkSetupGUI( parent, 0, TRUE ), TmpCollection() {
      Tab_TB->setTabEnabled( Setup_FRM, FALSE );
      Setup_FRM->setEnabled( FALSE );
      TmpIsValid = 0;
      SelectedNodes = 0;
      AutoCollapse_CB->setChecked( AutoCollapse );
      Mapping = new QPtrDict<ANetNode>;
      Mapping->setAutoDelete( FALSE );
      Nodes_LV->header()->hide();
      // popluate tree with all NetNodes 
      buildFullTree();
 }
-NodeCollection * EditConnection::getTmpCollection( void ) {
+NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
      if( TmpIsValid ) 
        // content is stil OK
        return &(TmpCollection);
      // reset collection -> delete all NEW NetNodes
      for( QListIterator<ANetNodeInstance> it(TmpCollection);
           it.current();
           ++it ) {
        if( it.current()->isNew() ) {
          delete it.current();
        }
      }
      TmpCollection.clear();
+      TmpCollection.copyFrom( *SelectedNodes );
      // update content
      QListViewItem * it = Nodes_LV->firstChild();
      ANetNode * NN;
      // start iter (if there is a collection)
      /*
          a node collection is sorted from the toplevel
          node to the deepest node
      */
      ANetNodeInstance * NNI = 
        (SelectedNodes) ? SelectedNodes->first() : 0 ;
      TmpCollection.setModified( 0 );
      // the listview always starts with the toplevel 
      // hierarchy.  This is always a controller item
      while ( it ) {
        NN = (*Mapping)[it];
        if( NN == 0 ) {
          // this item is a controller -> 
          // has radio items as children -> 
@@ -172,445 +174,445 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
          ANetNodeInstance * NNI = NN->createInstance();
          NNI->initialize();
          // this node type not in collection
          TmpCollection.append( NNI );
          // master collection changed because new item in it
          TmpCollection.setModified( 1 );
          // no more valid items in old list
          NNI = 0;
        } else {
          // already in list -> copy pointer
          TmpCollection.append( NNI );
          NNI = SelectedNodes->next();
        }
        // go deeper to next level
        // this level is can be a new controller
        // or an item
        it = it->firstChild();
      }
      TmpIsValid = 1;
      return &(TmpCollection);
 }
-// pass a connection NodeCollection to be edited
+// pass a NetworkSetup NetworkSetup to be edited
-void EditConnection::setConnection( NodeCollection * NC ) {
+void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
      ANetNodeInstance * NNI;
      ANetNode * NN;
      SelectedNodes = NC;
      Name_LE->setText( NC->name() );
      NNI = NC->first();
      // show configure tabl
      Tab_TB->setCurrentPage( 1 );
      // valid colledction
      Tab_TB->setTabEnabled( Setup_FRM, FALSE );
      Setup_FRM->setEnabled( FALSE );
      // select items in collection
      QListViewItem * it = Nodes_LV->firstChild();
      bool Found;
      TmpIsValid = 0;
      while ( it ) {
        NN = (*Mapping)[it];
        if( NN == 0 ) {
          // this item is a controller -> 
          // has radio items as children -> 
          // find selected one 
          it = it->firstChild();
          Found = 0;
          while( it ) {
            if( NNI && it->text(0) == NNI->nodeClass()->name() ) {
              // this radio is part of the collection
              ((QCheckListItem *)it)->setOn( 1 );
              updateGUI( it, NNI->nodeClass() );
              // check its children
              Found = 1;
              it = it->firstChild();
              NNI = SelectedNodes->next();
              // do not bother to check other items
              break;
            }
            it = it->nextSibling();
          }
          if( ! Found ) {
            // this means that this level is NOT present in collection
            // probably INCOMPATIBEL collection OR Missing plugin
            QMessageBox::warning(
                0, 
-                tr( "Error presentig Connection" ),
+                tr( "Error presentig NetworkSetup" ),
-                tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+                tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                    arg(NNI->nodeClass()->name()) );
            return;
          }
          // it now contains selected radio
          NN = (*Mapping)[it];
        } else {
          // automatic selection 
          if( NNI == 0 ||  it->text(0) != NNI->nodeClass()->name() ) {
            // should exist and be the same
            if( NNI ) {
              QMessageBox::warning(
                  0, 
-                  tr( "Error presentig Connection" ),
+                  tr( "Error presentig NetworkSetup" ),
-                  tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+                  tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                      arg(NNI->nodeClass()->name()) );
            } else {
              QMessageBox::warning(
                  0, 
-                  tr( "Error presentig Connection" ),
+                  tr( "Error presentig NetworkSetup" ),
-                  tr( "<p>Missing connection\"<i>%1</i>\"</p>" ).
+                  tr( "<p>Missing NetworkSetup\"<i>%1</i>\"</p>" ).
                      arg(it->text(0)) );
            }
            return;
          }
          it = it->firstChild();
        }
      }
 }
 // get result of editing (either new OR updated collection
-NodeCollection * EditConnection::connection( void ) {
+NetworkSetup * EditNetworkSetup::networkSetup( void ) {
      if( SelectedNodes == 0 ) {
        // new collection 
-        SelectedNodes = new NodeCollection;
+        SelectedNodes = new NetworkSetup;
      }
      // clean out old entries
      SelectedNodes->clear();
      // transfer 
      for( QListIterator<ANetNodeInstance> it(TmpCollection);
           it.current();
           ++it ) {
        SelectedNodes->append( it.current() );
      }
      if( TmpCollection.isModified() )
        SelectedNodes->setModified( 1 );
      if( SelectedNodes->name() != Name_LE->text() ) {
        SelectedNodes->setName( Name_LE->text() );
        SelectedNodes->setModified( 1 );
      }
      return SelectedNodes;
 }
 // Build device tree -> start 
-void EditConnection::buildFullTree( void ) {
+void EditNetworkSetup::buildFullTree( void ) {
    ANetNode * NN;
    // toplevel item
    MyQCheckListItem * TheTop = new MyQCheckListItem( 
        Nodes_LV, 
        NSResources->netNode2Name("fullsetup"),
        QCheckListItem::Controller );
    TheTop->setOpen( TRUE );
    Description_LBL->setText( 
          NSResources->netNode2Description( "fullsetup" ) );
    Nodes_LV->setSelected( TheTop, TRUE );
    // find all Nodes that are toplevel nodes -> ie provide
-    // TCP/IP Connection
+    // TCP/IP NetworkSetup
    for( QDictIterator<ANetNode> Iter(NSResources->netNodes());
         Iter.current();
         ++Iter ) {
      NN = Iter.current();
      if( ! NN->isToplevel() ) {
        continue;
      }
      MyQCheckListItem * it = new MyQCheckListItem( TheTop, 
          NN->name(), 
          QCheckListItem::RadioButton );
      it->setPixmap( 0, 
                     NSResources->getPixmap( NN->pixmapName() )
                   );
      // remember that this node maps to this listitem
      Mapping->insert( it, NN );
      buildSubTree( it, NN );
    }
 }
 // Build device tree -> help function 
-void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) {
+void EditNetworkSetup::buildSubTree( QListViewItem * it, ANetNode *NN ) {
    ANetNode::NetNodeList & NNL = NN->alternatives();
    if( NNL.size() > 1 ) {
      // this node has alternatives -> needs radio buttons
      it = new MyQCheckListItem( 
        it, 
        NSResources->netNode2Name(NN->needs()[0]),
        QCheckListItem::Controller );
      it->setSelectable( FALSE );
    }
    for ( unsigned int i=0; i < NNL.size(); i++ ) {
      QListViewItem * CI;
      if( NNL.size() > 1 ) {
        // generate radio buttons
        CI = new MyQCheckListItem( 
                (QCheckListItem *)it, 
                NNL[i]->name(), QCheckListItem::RadioButton );
        // remember that this node maps to this listitem
        CI->setPixmap( 0, NSResources->getPixmap( NNL[i]->pixmapName() ) );
        Mapping->insert( CI, NNL[i] );
        CI->setSelectable( FALSE );
      } else {
        // Single item
        CI = new MyQListViewItem( it, NNL[i]->name() );
        // remember that this node maps to this listitem
        Mapping->insert( CI, NNL[i] );
        CI->setSelectable( FALSE );
        CI->setPixmap( 0, NSResources->getPixmap( NNL[i]->pixmapName() ) );
      }
      buildSubTree( CI, NNL[i] );
    }
 }
 // Clicked ok OK button
-void EditConnection::accept( void ) {
+void EditNetworkSetup::accept( void ) {
    if( ! haveCompleteConfig( 0 ) || Name_LE->text().isEmpty() ) {
      QMessageBox::warning(
          0, 
-          tr( "Closing Connection Setup" ),
+          tr( "Closing NetworkSetup Setup" ),
          tr( "Definition not complete or no name" ) );
      return;
    }
    // check if all devices have acceptable input
    getTmpCollection();
    { ANetNodeInstance * NNI;
      QString S;
      for( QListIterator<ANetNodeInstance> it(TmpCollection);
           it.current();
           ++it ) {
        NNI = it.current();
        // widget must show its own problems
        S = NNI->acceptable();
        if( ! S.isEmpty() ) {
          QMessageBox::warning(
              0, 
              tr( "Cannot save" ),
              S );
          return;
        }
        NNI->commit();
        if( NNI->isModified() ) {
          TmpCollection.setModified( 1 );
          // commit the data
        }
      }
    }
    QDialog::accept();
 }
 // triggered by CB
-void EditConnection::SLOT_AutoCollapse( bool b ) {
+void EditNetworkSetup::SLOT_AutoCollapse( bool b ) {
    AutoCollapse = b;
 }
 // clicked on node in tree -> update GUI
-void EditConnection::SLOT_SelectNode( QListViewItem * it ) {
+void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
    ANetNode * NN;
    if( it == 0 || it->depth() == 0 ) {
      Description_LBL->setText( 
          NSResources->netNode2Description( "fullsetup" ) );
      // topevel or no selection
      return;
    }
    // store conversion from lvitem to node
    NN = (*Mapping)[ it ];
    if( ! NN ) {
      // intermediate node
      NN = (*Mapping)[ it->parent() ];
      if( NN ) {
        // figure out type of this node -> produce mesage
        Description_LBL->setText( NSResources->netNode2Description(
                                  NN->needs()[0]) );
      } else {
        Description_LBL->setText( "" );
      }
      return;
    }
    Description_LBL->setText( NN->nodeDescription() );
    if( ! it->isSelectable() ) {
      return;
    }
    if( ! ((QCheckListItem *)it)->isOn() ) {
      // clicked on line but NOT on Check or Radio item
      return;
    }
    // item has really changed -> update 
    TmpIsValid = 0;
    updateGUI( it, NN );
 }
 // cliecked on TAB to go to setup
-void EditConnection::SLOT_AlterTab( const QString & S ) {
+void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
    if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) {
      // switched to setup -> update CB and populate ws with
      // forms for devices
      if( ! TmpIsValid ) {
        getTmpCollection();
        // clear CB and Ws
        { QWidget * W;
          int i = 0;
          Devices_CB->clear();
          while( ( W = Setup_WS->widget( i ) ) ) {
            Setup_WS->removeWidget( W );
            i ++;
          }
        }
        // update CB
        // and populate WidgetStack
        { ANetNodeInstance * NNI;
          QListIterator<ANetNodeInstance> it(TmpCollection);
          int i = 0;
          QWidget * W;
          for ( ; it.current(); ++it ) {
            NNI = it.current();
            Devices_CB->insertItem(
                NSResources->getPixmap( NNI->nodeClass()->pixmapName() ),
                NNI->nodeClass()->name()
            );
            // add edit widget
            W = NNI->edit( Setup_WS );
            if( ! W) {
              W = new QLabel( Setup_WS, 
                              tr("No configuration required"));
            }
            Setup_WS->addWidget( W , i );
            i ++;
          }
        }
        Setup_WS->raiseWidget( 0 );
      } // still valid
    }
 }
 // update visual feedback of selection state
-void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
+void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
    bool HCC = haveCompleteConfig( it );
    Tab_TB->setTabEnabled( Setup_FRM, HCC );
    Setup_FRM->setEnabled( HCC );
    // disable children of all siblings at same level
    QListViewItem * Sbl = it->parent()->firstChild();
    while( Sbl ) {
      if ( Sbl != it ) {
        disableTree( Sbl->firstChild(), FALSE );
        Sbl->setSelectable( TRUE );
        if( AutoCollapse )
          Sbl->setOpen( FALSE );
      }
      Sbl = Sbl->nextSibling();
    }
    // enable selected path (as deep as it goes
    it->setOpen( TRUE );
    enablePath( it->firstChild(), 
                (it->depth()==1) ? 
                    1 : // toplevel always alternatives
                    (NN->alternatives().size() > 1) );
 }
-void EditConnection::disableTree( QListViewItem * it, bool Mode ) {
+void EditNetworkSetup::disableTree( QListViewItem * it, bool Mode ) {
    while( it ) {
      // disable sbl's chidren
      it->setSelectable( Mode );
      if( AutoCollapse )
        it->setOpen( Mode );
      disableTree( it->firstChild(), Mode );
      it = it->nextSibling();
    }
 }
 // pah : ParentHasAlternatives
-void EditConnection::enablePath( QListViewItem * it, bool pha ) {
+void EditNetworkSetup::enablePath( QListViewItem * it, bool pha ) {
    while( it ) {
      ANetNode * NN;
      NN = (*Mapping)[it];
      if( NN ) {
        if( pha ) {
          bool doOn = ((QCheckListItem *)it)->isOn();
          // we are a checklistitem for sure
          it->setSelectable( TRUE );
          if( AutoCollapse && ! doOn )
            it->setOpen( doOn );
          if( doOn ) {
            // selected alternative
            enablePath( it->firstChild(), 
                        NN->alternatives().size() > 1);
          } else {
            // non-selected alternative
            disableTree( it->firstChild(), FALSE);
          }
        } else {
          // we are single subitem
          it->setSelectable( TRUE );
          it->setOpen( TRUE );
          enablePath( it->firstChild(),
                      NN->alternatives().size() > 1);
        }
      } else {
        // controller node
        it->setSelectable( TRUE );
        it->setOpen( TRUE );
        enablePath( it->firstChild(), pha );
      }
      it = it->nextSibling();
    }
 }
 // do we have a complete configuration (all needs are provided for ?)
-bool EditConnection::haveCompleteConfig( QListViewItem * it ) {
+bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {
    // check if all below this level is selected
    it = ( it ) ?it : Nodes_LV->firstChild();
    ANetNode *NN;
    bool Found;
    while ( it ) {
      NN = (*Mapping)[it];
      if( NN == 0 ) {
        // this item is a controller -> 
        // has radio items as children -> 
        // find selected one 
        it = it->firstChild();
        Found = 0;
        while( it ) {
          if( ((QCheckListItem *)it)->isOn() ) {
            Found = 1;
            // go deeper
            it = it->firstChild();
            break;
          }
          it = it->nextSibling();
        }
diff --git a/noncore/settings/networksettings2/editconnection.h b/noncore/settings/networksettings2/editconnection.h
index e8d7a2c..c2fc643 100644
--- a/noncore/settings/networksettings2/editconnection.h
+++ b/noncore/settings/networksettings2/editconnection.h
@@ -1,49 +1,49 @@
 #include "editconnectionGUI.h"
 #include <qptrdict.h>
 #include <qvector.h>
 #include "netnode.h"
 class ANetNodeInstance;
 class ANetNode;
 class QListViewItem;
 class NetNodeLVI;
 class QCloseEvent;
-class EditConnection : public EditConnectionGUI {
+class EditNetworkSetup : public EditNetworkSetupGUI {
      Q_OBJECT
 public :
-      EditConnection( QWidget * P );
+      EditNetworkSetup( QWidget * P );
      ANetNodeInstance * netNodeInstance( void );
-      void setConnection( NodeCollection * NC );
+      void setNetworkSetup( NetworkSetup * NC );
-      NodeCollection * connection( void );
+      NetworkSetup * networkSetup( void );
 public slots :
      void SLOT_AutoCollapse( bool );
      void SLOT_SelectNode( QListViewItem * it );
      void SLOT_AlterTab( const QString & S );
      virtual void accept( void );
 private :
-      NodeCollection * getTmpCollection( void );
+      NetworkSetup * getTmpCollection( void );
      void updateGUI( QListViewItem * it, ANetNode * NN );
      void buildFullTree( void );
      void buildSubTree( QListViewItem * Parent, ANetNode * NN );
      void disableTree( QListViewItem * it, bool Mode);
      void enablePath( QListViewItem * it, bool pha);
      bool haveCompleteConfig( QListViewItem * it );
      QPtrDict<ANetNode> * Mapping;
-      NodeCollection * SelectedNodes;
+      NetworkSetup * SelectedNodes;
      bool           TmpIsValid;
-      NodeCollection TmpCollection;
+      NetworkSetup TmpCollection;
      static bool AutoCollapse;
 };
diff --git a/noncore/settings/networksettings2/editconnectionGUI.ui b/noncore/settings/networksettings2/editconnectionGUI.ui
index dfb2596..5e50490 100644
--- a/noncore/settings/networksettings2/editconnectionGUI.ui
+++ b/noncore/settings/networksettings2/editconnectionGUI.ui
@@ -1,31 +1,31 @@
 <!DOCTYPE UI><UI>
-<class>EditConnectionGUI</class>
+<class>EditNetworkSetupGUI</class>
 <widget>
    <class>QDialog</class>
    <property stdset="1">
        <name>name</name>
-        <cstring>EditConnectionGUI</cstring>
+        <cstring>EditNetworkSetupGUI</cstring>
    </property>
    <property stdset="1">
        <name>geometry</name>
        <rect>
            <x>0</x>
            <y>0</y>
            <width>427</width>
            <height>523</height>
        </rect>
    </property>
    <property stdset="1">
        <name>sizePolicy</name>
        <sizepolicy>
            <hsizetype>7</hsizetype>
            <vsizetype>7</vsizetype>
        </sizepolicy>
    </property>
    <property stdset="1">
        <name>minimumSize</name>
        <size>
            <width>0</width>
            <height>70</height>
        </size>
    </property>
@@ -96,49 +96,49 @@
                            </property>
                            <widget>
                                <class>QLabel</class>
                                <property stdset="1">
                                    <name>name</name>
                                    <cstring>Header_LBL</cstring>
                                </property>
                                <property stdset="1">
                                    <name>sizePolicy</name>
                                    <sizepolicy>
                                        <hsizetype>1</hsizetype>
                                        <vsizetype>1</vsizetype>
                                    </sizepolicy>
                                </property>
                                <property stdset="1">
                                    <name>frameShape</name>
                                    <enum>MShape</enum>
                                </property>
                                <property stdset="1">
                                    <name>frameShadow</name>
                                    <enum>MShadow</enum>
                                </property>
                                <property stdset="1">
                                    <name>text</name>
-                                    <string>Connection profile</string>
+                                    <string>NetworkSetup profile</string>
                                </property>
                                <property stdset="1">
                                    <name>alignment</name>
                                    <set>AlignVCenter|AlignLeft</set>
                                </property>
                                <property>
                                    <name>vAlign</name>
                                </property>
                            </widget>
                            <widget>
                                <class>QLineEdit</class>
                                <property stdset="1">
                                    <name>name</name>
                                    <cstring>Name_LE</cstring>
                                </property>
                            </widget>
                        </hbox>
                    </widget>
                    <widget>
                        <class>QListView</class>
                        <column>
                            <property>
                                <name>text</name>
                                <string>Column 1</string>
@@ -357,50 +357,50 @@
        <header location="global">qwidgetstack.h</header>
        <sizehint>
            <width>-1</width>
            <height>-1</height>
        </sizehint>
        <container>0</container>
        <sizepolicy>
            <hordata>7</hordata>
            <verdata>7</verdata>
        </sizepolicy>
        <pixmap>image0</pixmap>
        <slot access="public">raiseWidget( int )</slot>
    </customwidget>
 </customwidgets>
 <images>
    <image>
        <name>image0</name>
        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data>
    </image>
 </images>
 <connections>
    <connection>
        <sender>Nodes_LV</sender>
        <signal>clicked(QListViewItem*)</signal>
-        <receiver>EditConnectionGUI</receiver>
+        <receiver>EditNetworkSetupGUI</receiver>
        <slot>SLOT_SelectNode( QListViewItem *)</slot>
    </connection>
    <connection>
        <sender>AutoCollapse_CB</sender>
        <signal>toggled(bool)</signal>
-        <receiver>EditConnectionGUI</receiver>
+        <receiver>EditNetworkSetupGUI</receiver>
        <slot>SLOT_AutoCollapse( bool)</slot>
    </connection>
    <connection>
        <sender>Devices_CB</sender>
        <signal>activated(int)</signal>
        <receiver>Setup_WS</receiver>
        <slot>raiseWidget( int )</slot>
    </connection>
    <connection>
        <sender>Tab_TB</sender>
        <signal>selected(const QString&amp;)</signal>
-        <receiver>EditConnectionGUI</receiver>
+        <receiver>EditNetworkSetupGUI</receiver>
        <slot>SLOT_AlterTab( const QString &amp; )</slot>
    </connection>
    <slot access="public">SLOT_AlterTab( const QString &amp; )</slot>
    <slot access="public">SLOT_AutoCollapse( bool)</slot>
    <slot access="public">SLOT_SelectNode( QListViewItem *)</slot>
 </connections>
 </UI>
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
index e9553a6..374cf5a 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRS_NN.cpp
@@ -1,39 +1,39 @@
 #include <resources.h>
 #include <qpe/qpeapplication.h>
 #include <netnode.h>
 #include "GPRS_NN.h"
 #include "GPRS_NNI.h"
 #include "netnodeinterface.h"
 static const char * GPRSNeeds[] = 
    { "GPRS",
      0
    };
 static const char * GPRSProvides[] = 
-    { "connection", 
+    { "NetworkSetup", 
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
 GPRSNetNode::GPRSNetNode() : ANetNode(tr("GPRS capable device")) {
      NSResources->addSystemFile( 
        "pap-secrets", "/etc/ppp/pap-secrets", 0 );
 }
 /**
 * Delete any interfaces that we own.
 */
 GPRSNetNode::~GPRSNetNode(){
 }
 const QString GPRSNetNode::nodeDescription(){
      return tr("\
 <p>provides access to a GPRS capable device.</p>\
 "
 );
 }
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
index 2f61cba..bf8cc59 100644
--- a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp
@@ -101,131 +101,131 @@ short AGPRSDevice::generateFile( SystemFile & SF,
      return 0;
    } else if( SF.name() == "chatscripts" ) {
      SF << "SAY          \"Starting\\n\"" << oendl;
      SF << "ECHO         OFF" << oendl;
      SF << "ABORT        BUSY" << oendl;
      SF << "ABORT        ERROR" << oendl;
      SF << "ABORT        VOICE" << oendl;
      SF << "ABORT        \"NO CARRIER\"" << oendl;
      SF << "ABORT        \"NO DIALTONE\"" << oendl;
      SF << "\"\"           AT" << oendl;
      SF << "OK           AT+CGATT=1" << oendl;
      SF << "OK           AT+CGDCONT=1,\"IP\",\""
         << Data.APN 
         << "\"" 
         << oendl;
      SF << "OK           ATD*99***1#\\n" << oendl;
      SF << "TIMEOUT      10" << oendl;
      SF << "CONNECT      \"\"" << oendl;
      SF << "SAY          \"READY\\n\"" << oendl;
      return 0;
    } else if( SF.name() == "peers" ) {
      SF << "noauth" << oendl;
      SF << "user " << Data.User << oendl;
      SF << "connect \"/usr/sbin/chat -s -v -f /etc/chatscripts/" 
-         << removeSpaces( connection()->name() ) 
+         << removeSpaces( networkSetup()->name() ) 
         << "\"" 
         << oendl;
      SF << "ipcp-accept-local" << oendl;
      SF << "ipcp-accept-remote" << oendl;
      if( Data.DefaultGateway ) {
        SF << "defaultroute" << oendl;
        if( Data.SetIfSet ) {
          SF << "replacedefaultroute" << oendl;
        }
      }
      if( Data.Debug ) {
        SF << "logfile /tmp/" 
-           << removeSpaces( connection()->name() ) 
+           << removeSpaces( networkSetup()->name() ) 
           << oendl;
        for( int i = 0; i < Data.Debug; i ++ ) {
          SF << "debug" << oendl;
        }
      }
      SF << "nocrtscts" << oendl;
      SF << "local" << oendl;
      SF << "lcp-echo-interval 0" << oendl;
      SF << "lcp-echo-failure 0" << oendl;
      SF << "usepeerdns" << oendl;
-      SF << "linkname " << removeSpaces( connection()->name() ) << oendl;
+      SF << "linkname " << removeSpaces( networkSetup()->name() ) << oendl;
      SF << "nopersist" << oendl;
-      SF << "ipparam " << removeSpaces( connection()->name() ) <<oendl;
+      SF << "ipparam " << removeSpaces( networkSetup()->name() ) <<oendl;
      SF << "maxfail 1" << oendl;
      return 0;
    } else if( SF.name() == "extra" ) {
      unsigned long Bits;
      // generate 'fixed' settings
      for( unsigned int i = 0 ; 
           i < Data.Routing.count();
           i ++ ) {
        if( Data.Routing[i]->Mask == 32 ) {
          Bits = 0xffffffff;
        } else {
          Bits = ~ ((1 << ((32-Data.Routing[i]->Mask))) - 1);
        }
        SF << "route add -net "
           << Data.Routing[i]->Address
           << " netmask "
           << ((Bits&0xff000000)>>24)
           << "."
           << ((Bits&0x00ff0000)>>16)
           << "."
           << ((Bits&0x0000ff00)>>8)
           << "."
           << ((Bits&0x000000ff))
           << " gw $PPP_REMOTE"
           << oendl;
        SF << "route del -net "
           << Data.Routing[i]->Address
           << " netmask "
           << ((Bits&0xff000000)>>24)
           << "."
           << ((Bits&0x00ff0000)>>16)
           << "."
           << ((Bits&0x0000ff00)>>8)
           << "."
           << ((Bits&0x000000ff))
           << " gw $PPP_REMOTE"
           << oendl;
      }
      if( ! Data.DNS1.isEmpty() ) {
        SF << "nameserver "
           << Data.DNS1
           << " # profile "
-           << removeSpaces( connection()->name() )
+           << removeSpaces( networkSetup()->name() )
           <<oendl;
      }
      if( ! Data.DNS2.isEmpty() ) {
        SF << "nameserver "
           << Data.DNS2
           << " # profile "
-           << removeSpaces( connection()->name() )
+           << removeSpaces( networkSetup()->name() )
           <<oendl;
      }
    }
    return 1;
 }
 bool AGPRSDevice::openFile( SystemFile & SF ) {
    if( SF.name() == "peers" ) {
      SF.setPath( 
          QString( "/etc/ppp/peers/" ) + 
-              removeSpaces( connection()->name() )
+              removeSpaces( networkSetup()->name() )
          );
      return 1;
    } else if ( SF.name() == "chatscripts" ) {
      SF.setPath( 
          QString( "/etc/chatscripts/" ) + 
-              removeSpaces( connection()->name() )
+              removeSpaces( networkSetup()->name() )
          );
      return 1;
    } else if ( SF.name() == "extra" ) {
      SF.setPath( 
          QString( "/etc/ppp/" ) + 
-              removeSpaces( connection()->name() ) + ".fixed"
+              removeSpaces( networkSetup()->name() ) + ".fixed"
          );
      return 1;
    }
    return 0;
 }
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.cpp b/noncore/settings/networksettings2/gprs/GPRSrun.cpp
index cccc71a..fd61f3a 100644
--- a/noncore/settings/networksettings2/gprs/GPRSrun.cpp
+++ b/noncore/settings/networksettings2/gprs/GPRSrun.cpp
@@ -1,38 +1,38 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <errno.h>
 #include <qdir.h>
 #include <system.h>
 #include <resources.h>
 #include <netnode.h>
 #include "GPRSrun.h"
 State_t GPRSRun::detectState( void ) { 
      // is pppd still running ?
      // is rfcomm still active
-      NodeCollection * NC = nodeCollection();
+      NetworkSetup * NC = networkSetup();
      InterfaceInfo * I = NC->assignedInterface();
      QDir D("/var/run");
      if( I ) {
        // has some pppx attached
        return ( I->IsUp ) ? IsUp : Available;
      }
      // check ppp itself and figure out interface
      odebug << "Check for ppp " << NC->name() << oendl;
      if( D.exists( QString("ppp-")+removeSpaces(NC->name())+".pid") ) {
        // get pid and check if pppd is still running
        QFile F( D.path()+"/ppp-"+removeSpaces(NC->name())+".pid");
        odebug << "PPP PID " << F.name() << oendl;
        if( F.open( IO_ReadOnly ) ) {
          QTextStream TS(&F);
          QString X = TS.readLine();
          PPPPid = X.toULong();
          int rv;
          rv = ::kill( PPPPid, 0 );
@@ -41,49 +41,49 @@ State_t GPRSRun::detectState( void ) {
            ) {
            // pppd is still up
            X = TS.readLine();
            I = NSResources->system().findInterface(X);
            odebug << "ppp running : IFace " << X << " = " << (long)I << oendl;
            if( I ) {
              NC->assignInterface( I );
              return (I->IsUp) ? IsUp : Available;
            }
            return Available;
          } else {
            // pppd is down
            PPPPid = 0;
          } 
        } // else pppd is down
      }
      NC->assignInterface( 0 );
      return Unknown;
 }
-QString GPRSRun::setMyState( NodeCollection * NC, Action_t A , bool ) { 
+QString GPRSRun::setMyState( NetworkSetup * NC, Action_t A , bool ) { 
    if( A == Up ) {
      // start ppp on deviceFile
      QStringList SL;
      SL << "pon"
         << removeSpaces( NC->name() )
         << NC->device()->deviceFile();
      if( ! NSResources->system().execAsUser( SL ) ) {
        return QString("Cannot start pppd for %1").arg(NC->name());
      }
    } else if ( A == Down ) {
      if( PPPPid == 0 ) {
        detectState();
      }
      if( PPPPid ) {
        QStringList SL;
        SL << "poff"
           << removeSpaces( NC->name() );
        if( ! NSResources->system().execAsUser( SL ) ) {
          return QString("Cannot terminate pppd for %1").arg(NC->name());
        }
diff --git a/noncore/settings/networksettings2/gprs/GPRSrun.h b/noncore/settings/networksettings2/gprs/GPRSrun.h
index 817f8a9..c3c2015 100644
--- a/noncore/settings/networksettings2/gprs/GPRSrun.h
+++ b/noncore/settings/networksettings2/gprs/GPRSrun.h
@@ -3,32 +3,32 @@
 #include "GPRSdata.h"
 class GPRSRun  : public RuntimeInfo {
 public :
      GPRSRun( ANetNodeInstance * NNI, 
               GPRSData & D ) : RuntimeInfo( NNI ), 
                                   Pat( "ppp[0-9]" ) { 
        PPPPid = 0;
      }
      bool handlesInterface( const QString & I );
      bool handlesInterface( InterfaceInfo * );
      virtual RuntimeInfo * device( void ) 
        { return this; }
      virtual RuntimeInfo * connection( void ) 
        { return this; }
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      QRegExp Pat;
      size_t  PPPPid;
 };
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h
index d3b714b..e5ba79a 100644
--- a/noncore/settings/networksettings2/irda/irdarun.h
+++ b/noncore/settings/networksettings2/irda/irdarun.h
@@ -1,25 +1,25 @@
 #include <netnode.h>
 #include "irdadata.h"
 class IRDARun  : public RuntimeInfo {
 public :
      IRDARun( ANetNodeInstance * NNI, 
               IRDAData & Data ) : RuntimeInfo( NNI )
        { }
      virtual RuntimeInfo * line( void ) 
        { return this; }
      virtual QString deviceFile( void )
        { return QString( "/dev/irda" ); }
      State_t detectState( void )
        { return Unknown; }
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool )
+      QString setMyState( NetworkSetup * , Action_t, bool )
        { return QString(); }
 };
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp
index 8157dce..8a71aa9 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.cpp
+++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp
@@ -1,37 +1,37 @@
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <resources.h>
 #include "lancardrun.h"
 State_t LanCardRun::detectState( void ) {
    // unavailable : no card found
    // available : card found and assigned to us or free
    // up : card found and assigned to us and up
-    NodeCollection * NC = nodeCollection();
+    NetworkSetup * NC = networkSetup();
    QString S = QString( "/tmp/profile-%1.up" ).
                arg( NC->number());
    System & Sys = NSResources->system();
    InterfaceInfo * Run;
    QFile F( S );
    if( F.open( IO_ReadOnly ) ) {
      // could open file -> read interface and assign
      QString X;
      QTextStream TS(&F);
      X = TS.readLine();
      // find interface
      if( handlesInterface( X ) ) {
        for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
             It.current();
             ++It ) {
          Run = It.current();
          if( X == Run->Name ) {
            NC->assignInterface( Run );
            return (Run->IsUp) ? IsUp : Available;
          }
        }
      }
@@ -49,96 +49,96 @@ State_t LanCardRun::detectState( void ) {
    NC->assignInterface( 0 );
    // find possible interface
    for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
         It.current();
         ++It ) {
      Run = It.current();
      if( handlesInterface( *Run ) &&
          ( Run->CardType == ARPHRD_ETHER
 #ifdef ARPHRD_IEEE1394
            || Run->CardType == ARPHRD_IEEE1394
 #endif
          ) &&
          ! Run->IsUp
        ) {
        // proper type, and Not UP -> free
        return Off;
      }
    }
    // no free found
    return Unavailable;
 }
-QString LanCardRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
+QString LanCardRun::setMyState( NetworkSetup * NC, Action_t A, bool ) {
    if( A == Activate ) {
      InterfaceInfo * N = getInterface();
      if( ! N ) {
        // no interface available
        NC->setCurrentState( Unavailable );
        return tr("No interface found");
      }
      // because we were OFF the interface
      // we get back is NOT assigned
      NC->assignInterface( N );
      NC->setCurrentState( Available );
      return QString();
    }
    if( A == Deactivate ) {
      NC->assignInterface( 0 );
      NC->setCurrentState( Off );
    }
    return QString();
 }
 // get interface that is free or assigned to us
 InterfaceInfo * LanCardRun::getInterface( void ) {
    System & S = NSResources->system();
    InterfaceInfo * best = 0, * Run;
    for( QDictIterator<InterfaceInfo> It(S.interfaces());
         It.current();
         ++It ) {
      Run = It.current();
      if( handlesInterface( *Run ) &&
          ( Run->CardType == ARPHRD_ETHER
 #ifdef ARPHRD_IEEE1394
            || Run->CardType == ARPHRD_IEEE1394
 #endif
          )
        ) {
        // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
          // assigned to us
          return Run;
-        } else if( Run->assignedConnection() == 0 ) {
+        } else if( Run->assignedToNetworkSetup() == 0 ) {
          // free
          best = Run;
        }
      }
    }
    return best; // can be 0
 }
 bool LanCardRun::handlesInterface( const QString & S ) {
    InterfaceInfo * II;
    II = NSResources->system().interface( S );
    if( ( II = NSResources->system().interface( S ) ) ) {
      return handlesInterface( *II );
    }
    return Pat.match( S ) >= 0;
 }
 bool LanCardRun::handlesInterface( const InterfaceInfo & II ) {
    if( Pat.match( II.Name ) < 0 )
      return 0;
    if( Data->AnyLanCard ) {
      return 1;
    }
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h
index 57ef3fb..dfd3d62 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.h
+++ b/noncore/settings/networksettings2/lancard/lancardrun.h
@@ -4,34 +4,34 @@
 #include <netnode.h>
 #include <qregexp.h>
 #include "lancarddata.h"
 class LanCardRun  : public RuntimeInfo {
 public :
      LanCardRun( ANetNodeInstance * NNI, 
                  LanCardData & D ) : RuntimeInfo( NNI ),
                                      Pat( "eth[0-9]" ) { 
        Data = &D;
      }
      virtual RuntimeInfo * device( void ) 
        { return this; }
      bool handlesInterface( const QString & I );
      bool handlesInterface( const InterfaceInfo & II );
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      InterfaceInfo * getInterface( void );
      QRegExp Pat;
      LanCardData * Data;
 };
 #endif
diff --git a/noncore/settings/networksettings2/modem/modemrun.h b/noncore/settings/networksettings2/modem/modemrun.h
index eb3a193..df6b370 100644
--- a/noncore/settings/networksettings2/modem/modemrun.h
+++ b/noncore/settings/networksettings2/modem/modemrun.h
@@ -1,25 +1,25 @@
 #include <netnode.h>
 #include "modemdata.h"
 class ModemRun  : public RuntimeInfo {
 public :
      ModemRun( ANetNodeInstance * NNI, 
                ModemData & Data ) : RuntimeInfo ( NNI )
        { }
      virtual RuntimeInfo * line( void ) 
        { return this; }
      virtual QString deviceFile( void )
        { return QString("/dev/modem"); }
      State_t detectState( void )
        { return Unknown;}
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool )
+      QString setMyState( NetworkSetup * , Action_t, bool )
        { return QString(); }
 };
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index 2fa31bd..80a7fac 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -1,39 +1,39 @@
 #include <qpe/qpeapplication.h>
 #include <resources.h>
 #include <netnode.h>
 #include "network_NN.h"
 #include "network_NNI.h"
 #include "netnodeinterface.h"
 static const char * NetworkNeeds[] = 
    { "device", 
      0
    };
 static const char * NetworkProvides[] = 
-    { "connection",
+    { "NetworkSetup",
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
 NetworkNetNode::NetworkNetNode() : ANetNode(tr("IP Configuration")) {
      NSResources->addSystemFile(
        "interfaces", "/etc/network/interfaces", 1 );
 }
 /**
 * Delete any interfaces that we own.
 */
 NetworkNetNode::~NetworkNetNode(){
 }
 const QString NetworkNetNode::nodeDescription(){
      return tr("\
 <p>Sets up TCP/IP options.</p>\
 <p>Use this to configure the TCP/IP protocol</p>\
 "
 );
diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp
index 34dac54..c183d5e 100644
--- a/noncore/settings/networksettings2/network/network_NNI.cpp
+++ b/noncore/settings/networksettings2/network/network_NNI.cpp
@@ -96,83 +96,83 @@ QString ANetwork::acceptable( void ) {
 void ANetwork::commit( void ) {
    if( GUI && GUI->commit( Data ) )
      setModified( 1 );
 }
 bool ANetwork::hasDataForFile( SystemFile & S ) {
      return S.name() == "interfaces";
 }
 short ANetwork::generateFile( SystemFile &SF,
                               long DevNr 
                             ) {
    short rvl, rvd ;
    QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr );
    rvl = 1;
    if( SF.name() == "interfaces" ) {
      Log(("Generate Network for %s\n", SF.name().latin1() ));
      // we can safely call from here since device item is deeper
      if( Data.UseDHCP ) {
        SF << "iface " 
           << "A" 
-           << connection()->number() 
+           << networkSetup()->number() 
           << NIC 
           << " inet dhcp" 
           << endl;
        SF << "  up echo \"" 
           << NIC 
           << "\" > /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
           << ".up" 
           << endl;
        if( Data.SendHostname ) {
          SF << "  hostname "
             << Data.Hostname  
             << endl;
        }
        SF << "  down rm -f /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
           << ".up"
           << endl;
      } else {
        SF << "iface " 
           << "A" 
-           << connection()->number() 
+           << networkSetup()->number() 
           << NIC 
           << " inet static" 
           << endl;
        SF << "  up echo \"" 
           << NIC 
           << "\" > /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
           << ".up" 
           << endl;
        SF << "  down rm -f /tmp/profile-" 
-           << connection()->number() 
+           << networkSetup()->number() 
           << ".up" 
           << endl;
        SF << "  address   " 
           << Data.IPAddress 
           << endl;
        SF << "  broadcast " 
           << Data.Broadcast 
           << endl;
        SF << "  netmask   " 
           << Data.NetMask 
           << endl;
        // derive network address = IPAddress & netmask
        { QString NW;
          QStringList ipal = QStringList::split( '.', Data.IPAddress );
          QStringList nmal = QStringList::split( '.', Data.NetMask );
          NW = QString( "%1.%2.%3.%4" ).
              arg( ipal[0].toShort() & nmal[0].toShort() ).
              arg( ipal[1].toShort() & nmal[1].toShort() ).
              arg( ipal[2].toShort() & nmal[2].toShort() ).
              arg( ipal[3].toShort() & nmal[3].toShort() );
          SF << "  network   " 
             << NW 
@@ -190,29 +190,29 @@ short ANetwork::generateFile( SystemFile &SF,
            it != Data.PostUp_SL.end(); 
            ++it ) {
        SF << "  up        " 
           << (*it) 
           << endl;
      }
      for ( QStringList::Iterator it = Data.PreDown_SL.begin(); 
            it != Data.PreDown_SL.end(); 
            ++it ) {
        SF << "  down      " 
           << (*it) 
           << endl;
      }
      for ( QStringList::Iterator it = Data.PostDown_SL.begin(); 
            it != Data.PostDown_SL.end(); 
            ++it ) {
        SF << "  post-down " 
           << (*it) 
           << endl;
      }
      rvl = 0;
    }
    // embed other info in it
-    rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr );
+    rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr );
    return (rvd == 2 || rvl == 2 ) ? 2 :
           (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index 74467ad..7039a36 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -1,51 +1,50 @@
 #include <system.h>
 #include <netnode.h>
 #include <resources.h>
 #include "networkrun.h"
 State_t NetworkRun::detectState( void ) { 
-    InterfaceInfo * II = nodeCollection()->assignedInterface();
+    InterfaceInfo * II = networkSetup()->assignedInterface();
-    Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 ));
    if( II && II->IsUp ) {
      // device has assigned interface
      return IsUp;
    }
    // had no interface or interface is no longer up -> release
-    nodeCollection()->assignInterface( 0 );
+    networkSetup()->assignInterface( 0 );
    return Unknown;
 }
-QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString NetworkRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { 
    // we handle UP and DOWN
    InterfaceInfo * II = NC->assignedInterface();
    if( ! II ) {
      Log(( "no interface assigned." ));
      return QString();
    }
    QStringList SL;
    if( A == Up ) {
      // we can bring UP if lower level is available
      SL << "ifup";
    } else if( A == Down ) {
      SL << "ifdown";
    } else {
      return QString();
    }
    SL << QString().sprintf( "%s=A%ld%s",
                        II->Name.latin1(), 
-                        nodeCollection()->number(),
+                        networkSetup()->number(),
                        II->Name.latin1() );
    if( ! NSResources->system().runAsRoot( SL ) ) {
      return QString("Cannot call %1").arg(SL.join(" "));
    }
    return QString();
 }
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h
index 78a1694..ac186e7 100644
--- a/noncore/settings/networksettings2/network/networkrun.h
+++ b/noncore/settings/networksettings2/network/networkrun.h
@@ -1,20 +1,20 @@
 #include <netnode.h>
 #include "networkdata.h"
 class NetworkRun  : public RuntimeInfo {
 public :
      NetworkRun( ANetNodeInstance * NNI, 
                  NetworkData & Data ) : RuntimeInfo( NNI )
        { }
      virtual RuntimeInfo * connection( void ) 
        { return this; }
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 };
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index 78b6cce..80dcb3d 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -43,66 +43,66 @@ NetworkSettings::NetworkSettings( QWidget *parent,
    QVBoxLayout* V = new QVBoxLayout( LED_Frm );
    QHBoxLayout * H = new QHBoxLayout( 0 );
    V->addStretch(1);
    V->addLayout( H );
    Leds[0] = new Opie::Ui::OLedBox( red, LED_Frm );
    H->addWidget( Leds[0], 0, Qt::AlignVCenter );
    Leds[1] = new Opie::Ui::OLedBox( red, LED_Frm );
    H->addWidget( Leds[1], 0, Qt::AlignVCenter );
    Leds[2] = new Opie::Ui::OLedBox( red, LED_Frm );
    H->addWidget( Leds[2], 0, Qt::AlignVCenter );
    V->addStretch(1);
    SLOT_ToProfile();
    // populate main Listbox
    Profiles_LB->clear();
    QPEApplication::setStylusOperation( 
        Profiles_LB->viewport(), QPEApplication::RightOnHold );
    connect( Profiles_LB, 
             SIGNAL(rightButtonPressed(QListBoxItem*,const QPoint&)),
             this, SLOT(SLOT_EditNode(QListBoxItem*)) );
-    { Name2Connection_t & M = NSResources->connections();
+    { Name2NetworkSetup_t & M = NSResources->networkSetups();
-      NodeCollection * NC;
+      NetworkSetup * NC;
-      // for all connections
+      // for all NetworkSetups
-      for( QDictIterator<NodeCollection> it(M);
+      for( QDictIterator<NetworkSetup> it(M);
           it.current();
           ++it ) {
        NC = it.current();
        Profiles_LB->insertItem( NC->devicePixmap(),
                                 NC->name() );
      }
    }
    if( Profiles_LB->count() ) {
      Profiles_LB->setSelected( 0, TRUE );
    }
    // if no profiles -> auto popup editing
-    if( NSResources->connections().count() == 0 ) {
+    if( NSResources->networkSetups().count() == 0 ) {
      QTimer::singleShot( 100, this, SLOT(SLOT_AddNode() ) );
    }
    connect( &(NSResources->system()), 
             SIGNAL( stdoutLine(const QString &) ),
             this, SLOT( SLOT_CmdMessage(const QString &) ) );
    connect( &(NSResources->system()), 
             SIGNAL( stderrLine(const QString &) ),
             this, SLOT( SLOT_CmdMessage(const QString &) ) );
    connect( &(NSResources->system()), 
             SIGNAL( processEvent(const QString &) ),
             this, SLOT( SLOT_CmdMessage(const QString &) ) );
    UpdateTimer->start( 5000 );
    connect( UpdateTimer, SIGNAL( timeout() ),
             this, SLOT( SLOT_RefreshStates() ) );
    /* Add QCopChannel */
    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
             this, SLOT(SLOT_QCopMessage(const QCString&,const QByteArray&)) );
 }
@@ -115,183 +115,183 @@ NetworkSettings::~NetworkSettings() {
        S.insert( 0, "<p>" );
        S.append( "</p>" );
        // problem saving
        QMessageBox::warning(
              0, 
              tr( "Saving setup" ), S );
      }
      SLOT_GenerateConfig();
      NSD.setModified( 0 );
    }
 }
 void NetworkSettings::SLOT_CmdMessage( const QString & S ) {
    Messages_LB->insertItem( S );
    Messages_LB->setCurrentItem( Messages_LB->count()-1 );
    Messages_LB->ensureCurrentVisible();
 }
 void NetworkSettings::SLOT_RefreshStates( void ) {
    QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); // remember
    if( LBI ) {
-      NodeCollection * NC;
+      NetworkSetup * NC;
      NSResources->system().probeInterfaces();
      // update current selection only
-      NC = NSResources->findConnection( LBI->text() );
+      NC = NSResources->findNetworkSetup( LBI->text() );
      if( NC ) {
        State_t OldS = NC->state();
        State_t NewS = NC->state(1);
        if( OldS != NewS ) {
          updateProfileState( LBI );
        }
      }
    }
    /* -> LATER !!
    bool is;
-    NodeCollection * NC;
+    NetworkSetup * NC;
    for( unsigned int i = 0; i < Profiles_LB->count() ; i ++ ) {
-      NC = NSResources->findConnection( Profiles_LB->text(i) );
+      NC = NSResources->findNetworkSetup( Profiles_LB->text(i) );
      if( NC ) {
        State_t OldS = NC->state();
        State_t NewS = NC->state(1);
        if( OldS != NewS ) {
          is = Profiles_LB->isSelected(i);
          Profiles_LB->changeItem( NC->statePixmap(NewS), 
                                   NC->name(), 
                                   i );
          if( is ) {
            Profiles_LB->setSelected( i, TRUE );
          }
        }
      }
    }
    if( ci >= 0 )
      Profiles_LB->setCurrentItem( ci );
    */
 }
 void NetworkSettings::SLOT_AddNode( void ) {
    SLOT_EditNode( 0 );
 }
 void NetworkSettings::SLOT_DeleteNode( void ) {
    QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); 
    if ( ! LBI ) 
      return;
    if( QMessageBox::warning(
          0, 
          tr( "Removing profile" ),
          tr( "Remove selected profile ?" ), 
          1, 0 ) == 1 ) {
-      NSResources->removeConnection( LBI->text() );
+      NSResources->removeNetworkSetup( LBI->text() );
      delete LBI;
      NSD.setModified( 1 );
    }
 }
 void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
    QString OldName = "";
-    EditConnection EC( this );
+    EditNetworkSetup EC( this );
    if( LBI ) {
-      NodeCollection * NC = NSResources->findConnection( LBI->text() );
+      NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
      if( ! NC ) {
        return;
      }
      OldName = NC->name();
-      EC.setConnection( NC );
+      EC.setNetworkSetup( NC );
    }
    EC.showMaximized();
    // disable refresh timer 
    UpdateTimer->stop();
    // we need to retry
    while( 1 ) {
      if( EC.exec() == QDialog::Accepted ) {
        // toplevel item -> store
-        NodeCollection * NC = EC.connection();
+        NetworkSetup * NC = EC.networkSetup();
        if( NC->isModified() ) {
          if( LBI ) {
            if( NC->name() != OldName ) {
              // find if new name is free
-              NodeCollection * LCN = NSResources->findConnection(
+              NetworkSetup * LCN = NSResources->findNetworkSetup(
                    NC->name() );
              if( LCN ) {
                QMessageBox::warning(
                  0, 
                  tr( "In System Config" ),
                  tr( "Name %1 already exists" ).arg(NC->name())
                );
                continue; // restart exec
              } // else new name
              // new name -> remove item
-              NSResources->removeConnection( OldName );
+              NSResources->removeNetworkSetup( OldName );
-              NSResources->addConnection( NC, 0 );
+              NSResources->addNetworkSetup( NC, 0 );
            } // else not changed
            // must add it here since change will trigger event
            Profiles_LB->changeItem( NC->devicePixmap(),
                                     NC->name(),
                                     Profiles_LB->index( LBI )
                                   );
          } else {
            // new item
            int ci = Profiles_LB->count();
-            NSResources->addConnection( NC, 0 );
+            NSResources->addNetworkSetup( NC, 0 );
-            NC->setNumber( NSResources->assignConnectionNumber() );
+            NC->setNumber( NSResources->assignNetworkSetupNumber() );
            Profiles_LB->insertItem( NC->devicePixmap(), NC->name() );
            Profiles_LB->setSelected( ci, TRUE );
          }
          updateProfileState( LBI );
        }
      } else {
-        // cancelled : reset connection 
+        // cancelled : reset NetworkSetup 
        if( LBI ) {
-          NodeCollection * NC = NSResources->findConnection( LBI->text() );
+          NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
          NC->reassign();
        }
      }
      break;
    }
    // reenable 
    UpdateTimer->start( 5000 );
 }
 void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) {
    if( LBI == 0 ) 
      return;
-    NodeCollection * NC = NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
    if( NC->description().isEmpty() ) {
      Description_LBL->setText( tr( "<<No description>>" ) );
    } else {
      Description_LBL->setText( NC->description() );
    }
    Profile_GB->setTitle( LBI->text() + " : " + NC->stateName() );
    bool FrmActive = 1;
    bool IsEnabled = 1;
    int leds = 0;
    switch( NC->state() ) {
      case Disabled : // no further work
        IsEnabled = 0;
        FrmActive = 0;
        break;
      case Unknown :
      case Unchecked :
      case Unavailable :
        FrmActive = 0;
        break;
      case Off :
@@ -332,79 +332,79 @@ void NetworkSettings::updateProfileState( QListBoxItem * LBI ) {
    if( LBI == Profiles_LB->item( Profiles_LB->currentItem() ) ) {
      SLOT_ShowNode( LBI );
    }
 }
 void NetworkSettings::SLOT_GenerateConfig( void ) {
    QString S = NSD.generateSettings();
    if( ! S.isEmpty() ) {
      S.insert( 0, "<p>" );
      S.append( "</p>" );
      QMessageBox::warning(
          0, 
          tr( "Generate config" ),
          S);
    }
 }
 void NetworkSettings::SLOT_Disable( bool T ) {
    QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() );
    QString Msg;
    if ( ! LBI ) 
      return;
-    NodeCollection * NC = NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
    Log(( "Prepare to %sable\n", (T) ? "en" : "dis" ));
    Msg = NC->setState( (T) ? Disable : Enable );
    if( ! Msg.isEmpty() ) {
      Msg.insert( 0, "<p>" );
      Msg.append( "</p>" );
      QMessageBox::warning(
          0, 
          tr( "Activating profile" ),
          Msg );
      return;
    }
    // reload new state
    NC->state( true );
    updateProfileState( LBI );
 }
 void NetworkSettings::SLOT_Up( void ) {
    // bring more up
    QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() );
    QString Msg;
    int led = -1;
    if ( ! LBI ) 
      return;
-    NodeCollection * NC = 
+    NetworkSetup * NC = 
-        NSResources->findConnection( LBI->text() );
+        NSResources->findNetworkSetup( LBI->text() );
    switch( NC->state() ) {
      case Disabled : // cannot modify this state
      case Unknown : // cannot modify this state
      case Unchecked : // cannot modify this state
      case Unavailable : // cannot modify this state
      case IsUp : // highest UP state
        return;
      case Off : // -> activate
        led = 1;
        Down_TB->setEnabled( true );
        Log(( "Activate interface %s\n", NC->name().latin1() ));
        Msg = NC->setState( Activate );
        break;
      case Available : // -> up
        led = 2;
        Log(( "Bring up interface %s\n", NC->name().latin1() ));
        Msg = NC->setState( Up );
        if( Msg.isEmpty() ) {
          Up_TB->setEnabled( false );
        }
        break;
    }
@@ -417,50 +417,50 @@ void NetworkSettings::SLOT_Up( void ) {
          Msg );
      return;
    }
    updateProfileState( LBI );
    // set color of led we should change 
    if( led > 0 ) {
      Leds[led]->setColor( blue );
      Leds[led]->setOn( true );
    }
 }
 void NetworkSettings::SLOT_Down( void ) {
    // bring more down
    QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() );
    int led = -1;
    QString Msg;
    if ( ! LBI ) 
      return;
-    NodeCollection * NC = 
+    NetworkSetup * NC = 
-        NSResources->findConnection( LBI->text() );
+        NSResources->findNetworkSetup( LBI->text() );
    switch( NC->state() ) {
      case Disabled : // cannot modify this state
      case Unknown : // cannot modify this state
      case Unchecked : // cannot modify this state
      case Unavailable : // cannot modify this state
      case Off : // highest DOWN state
        break;
      case Available : // -> down
        led = 0;
        Log(( "Deactivate interface %s\n", NC->name().latin1() ));
        Msg = NC->setState( Deactivate );
        Down_TB->setEnabled( false );
        break;
      case IsUp : // highest UP state
        led = 1;
        Up_TB->setEnabled( true );
        Log(( "Bring down interface %s\n", NC->name().latin1() ));
        Msg = NC->setState( Down, 1 );
        if( Msg.isEmpty() ) {
          // remove 'up' file to make sure
          unlink ( QString().sprintf( "/tmp/Profile-%d.up", NC->number() ).latin1() );;
        }
        break;
diff --git a/noncore/settings/networksettings2/networksettings2/asconnection.h b/noncore/settings/networksettings2/networksettings2/asconnection.h
index 1ed7e74..eeb0939 100644
--- a/noncore/settings/networksettings2/networksettings2/asconnection.h
+++ b/noncore/settings/networksettings2/networksettings2/asconnection.h
@@ -1,18 +1,18 @@
 #ifndef ASCONNECTION_H
 #define ASCONNECTION_H
 #include <resources.h>
 // pure virtual (component oriented) interface of any
-// plugin that offers a connection
+// plugin that offers a networkSetup
-class AsConnection : public RuntimeInfo {
+class AsNetworkSetup : public RuntimeInfo {
 public :
-    AsConnection( ANetNodeInstance * NNI ) :
+    AsNetworkSetup( ANetNodeInstance * NNI ) :
        RuntimeInfo( NNI ) { 
    }
 };
 #endif
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp
index f00e0b3..0ab0e5b 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.cpp
+++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp
@@ -104,319 +104,319 @@ long ANetNodeInstance::InstanceCounter = -1;
 void ANetNodeInstance::initialize( void ) {
    if( InstanceCounter == -1 )
      InstanceCounter = time(0);
    // set name
    QString N;
    N.sprintf( "-%ld", InstanceCounter++ );
    N.prepend( NodeType->name() );
    setName( N.latin1() );
 }
 void ANetNodeInstance::setAttribute( QString & Attr, QString & Value ){
    if( Attr == "__name" ) {
      setName( Value.latin1() );
    } else {
      setSpecificAttribute( Attr, Value );
    }
 }
 void ANetNodeInstance::saveAttributes( QTextStream & TS ) {
    TS << "__name=" << name() << endl;
    saveSpecificAttribute( TS );
 }
 ANetNodeInstance * ANetNodeInstance::nextNode( void ) {
-    return connection()->findNext( this );
+    return networkSetup()->findNext( this );
 }
 //
 //
 // NODECOLLECTION
 //
 //
-NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() {
+NetworkSetup::NetworkSetup( void ) : QList<ANetNodeInstance>() {
    IsModified = 0;
    Index = -1;
    Name="";
    IsNew = 1;
    CurrentState = Unchecked;
    AssignedInterface = 0;
    Number = -1;
    Done = 0;
 }
-NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
+NetworkSetup::NetworkSetup( QTextStream & TS, bool & Dangling ) :
      QList<ANetNodeInstance>() {
    long idx;
    QString S, A, N;
    Number = -1;
    Done = 0;
    IsModified = 0;
    Index = -1;
    Name="";
    IsNew = 0;
    AssignedInterface = 0;
    CurrentState = Unchecked;
    Dangling = 0; // by default node collection is ok
    do {
      S = TS.readLine();
      if( S.isEmpty() ) {
        // empty line
        break;
      }
      idx = S.find('=');
      S.stripWhiteSpace();
      A = S.left( idx );
      A.lower();
      N = S.mid( idx+1, S.length() );
      N.stripWhiteSpace();
      N = deQuote( N );
      if( A == "name" ) {
        Name = N;
      } else if( A == "number" ) {
        setNumber( N.toLong() );
      } else if( A == "node" ) {
        ANetNodeInstance * NNI = NSResources->findNodeInstance( N );
        Log(( "Find node %s : %p\n", N.latin1(), NNI ));
        if( NNI ) {
          append( NNI );
        } else {
          // could not find a node type -> collection invalid
-          Log(( "Node %s missing -> connection dangling\n", 
+          Log(( "Node %s missing -> NetworkSetup dangling\n", 
                      N.latin1() ));
          // create placeholder for this dangling NNI
          NNI = new ErrorNNI( N );
          Dangling = 1;
        }
      }
    } while( 1 );
    Log(( "Profile number %s : %d nodes\n", 
          Name.latin1(), count() ));
 }
-NodeCollection::~NodeCollection( void ) {
+NetworkSetup::~NetworkSetup( void ) {
 }
-const QString & NodeCollection::description( void ) {
+const QString & NetworkSetup::description( void ) {
    ANetNodeInstance * NNI = getToplevel();
    return (NNI) ? NNI->runtime()->description() : Name;
 }
-void NodeCollection::append( ANetNodeInstance * NNI ) {
+void NetworkSetup::append( ANetNodeInstance * NNI ) {
-    NNI->setConnection( this );
+    NNI->setNetworkSetup( this );
    QList<ANetNodeInstance>::append( NNI );
 }
-void NodeCollection::save( QTextStream & TS ) {
+void NetworkSetup::save( QTextStream & TS ) {
    TS << "name=" << quote( Name ) << endl;
    TS << "number=" << number() << endl;
    ANetNodeInstance * NNI;
    for( QListIterator<ANetNodeInstance> it(*this); 
         it.current();
         ++it ) {
      NNI = it.current();
      TS << "node=" << NNI->name() << endl;
    }
    TS << endl;
    IsNew = 0;
 }
-ANetNodeInstance * NodeCollection::getToplevel( void ) {
+ANetNodeInstance * NetworkSetup::getToplevel( void ) {
    ANetNodeInstance * NNI = 0;
    for( QListIterator<ANetNodeInstance> it(*this); 
         it.current();
         ++it ) {
      NNI = it.current();
      if( NNI->nodeClass()->isToplevel() ) {
        return NNI;
      }
    }
    return 0;
 }
-ANetNodeInstance * NodeCollection::findByName( const QString & S ) {
+ANetNodeInstance * NetworkSetup::findByName( const QString & S ) {
    ANetNodeInstance * NNI = 0;
    for( QListIterator<ANetNodeInstance> it(*this); 
         it.current();
         ++it ) {
      NNI = it.current();
      if( NNI->name() == S ) {
        return NNI;
      }
    }
    return 0;
 }
-ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) {
+ANetNodeInstance * NetworkSetup::findNext( ANetNodeInstance * NNI ) {
    ANetNodeInstance * NNNI;
    if( ! NNI )
      getToplevel();
    for( QListIterator<ANetNodeInstance> it(*this); 
         it.current();
         ++it ) {
      NNNI = it.current();
      if( NNNI == NNI ) {
        ++it;
        return it.current();
      }
    }
    return 0; // no more next
 }
-int NodeCollection::compareItems( QCollection::Item I1, 
+int NetworkSetup::compareItems( QCollection::Item I1, 
                                  QCollection::Item I2 ) {
    ANetNodeInstance * NNI1, * NNI2;
    NNI1 = (ANetNodeInstance *)I1;
    NNI2 = (ANetNodeInstance *)I2;
    return strcmp( NNI1->name(), NNI2->name() );
 }
 static char * State2PixmapTbl[] = {
    "NULL", // Unchecked : no pixmap
    "check", // Unknown 
    "delete", // unavailable 
    "disabled", // disabled 
    "off", // off 
    "disconnected", // available 
    "connected" // up 
 };
-QPixmap NodeCollection::devicePixmap( void ) {
+QPixmap NetworkSetup::devicePixmap( void ) {
    QPixmap pm = NSResources->getPixmap(
            getToplevel()->nextNode()->pixmapName()+"-large");
    QPixmap Mini = NSResources->getPixmap( 
            device()->netNode()->pixmapName() );
    if( pm.isNull() || Mini.isNull() )
        return Resource::loadPixmap("Unknown");
    QPainter painter( &pm );
    painter.drawPixmap( pm.width()-Mini.width(), 
                        pm.height()-Mini.height(), 
                        Mini );
    pm.setMask( pm.createHeuristicMask( TRUE ) );
    return pm;
 }
-QPixmap NodeCollection::statePixmap( State_t S) {
+QPixmap NetworkSetup::statePixmap( State_t S) {
    return NSResources->getPixmap( State2PixmapTbl[S] );
 }
-QString NodeCollection::stateName( State_t S) {
+QString NetworkSetup::stateName( State_t S) {
    switch( S ) {
      case Unknown :
        return qApp->translate( "networksettings2", "Unknown");
      case Unavailable :
        return qApp->translate( "networksettings2", "Unavailable");
      case Disabled :
        return qApp->translate( "networksettings2", "Disabled");
      case Off :
        return qApp->translate( "networksettings2", "Inactive");
      case Available :
        return qApp->translate( "networksettings2", "Available");
      case IsUp :
        return qApp->translate( "networksettings2", "Up");
      case Unchecked : /* FT */
      default :
        break;
    }
    return QString("");
 }
-void NodeCollection::reassign( void ) {
+void NetworkSetup::reassign( void ) {
    for( QListIterator<ANetNodeInstance> it(*this); 
         it.current();
         ++it ) {
-      it.current()->setConnection( this );
+      it.current()->setNetworkSetup( this );
    }
 }
-const QStringList & NodeCollection::triggers() {
+const QStringList & NetworkSetup::triggers() {
    return getToplevel()->runtime()->triggers();
 }
-bool NodeCollection::hasDataForFile( SystemFile & S ) {
+bool NetworkSetup::hasDataForFile( SystemFile & S ) {
    return ( firstWithDataForFile( S ) != 0 );
 }
-ANetNodeInstance * NodeCollection::firstWithDataForFile( SystemFile & S ) {
+ANetNodeInstance * NetworkSetup::firstWithDataForFile( SystemFile & S ) {
    for( QListIterator<ANetNodeInstance> it(*this); 
         it.current();
         ++it ) {
      if( it.current()->hasDataForFile( S ) ) {
        return it.current();
      }
    }
    return 0;
 }
-State_t NodeCollection::state( bool Update ) {
+State_t NetworkSetup::state( bool Update ) {
    State_t NodeState;
    if( CurrentState == Unchecked || Update ) {
      // collect states of all nodes until with get the 'higest'
      // state possible
-      Log(( "Connection %s state %s\n", 
+      Log(( "NetworkSetup %s state %s\n", 
                Name.latin1(), StateName[CurrentState] ));
      CurrentState = Unknown;
      for( QListIterator<ANetNodeInstance> it(*this); 
           it.current();
           ++it ) {
        Log(( "-> Detect %s\n", it.current()->name() ));
        NodeState = it.current()->runtime()->detectState();
        Log(( "   state %s\n", StateName[NodeState] ));
        if( NodeState == Disabled ||
            NodeState == IsUp ) {
          // max
          CurrentState = NodeState;
          break;
        }
        if( NodeState > CurrentState ) {
          // higher
          CurrentState = NodeState;
        }
      }
    }
    return CurrentState;
 }
-QString NodeCollection::setState( Action_t A, bool Force ) {
+QString NetworkSetup::setState( Action_t A, bool Force ) {
    QString msg;
    Action_t Actions[10];
    int NoOfActions = 0;
    // get current state
    state( Force );
    switch( A ) {
      case Disable :
        if( CurrentState < Disabled ) {
          // disabled
          CurrentState = Disabled;
          return QString();
        }
        if( CurrentState == IsUp ) {
          Actions[NoOfActions++] = Down;
          Actions[NoOfActions++] = Deactivate;
        } else if( CurrentState == Available ) {
          Actions[NoOfActions++] = Deactivate;
        }
        Actions[NoOfActions++] = Disable;
        break;
@@ -471,49 +471,58 @@ QString NodeCollection::setState( Action_t A, bool Force ) {
        if( ! Force ) {
          if( CurrentState < Available ) {
            // OK
            return QString();
          }
        }
        Actions[NoOfActions++] = Down;
        break;
    }
    // send actions to all nodes
    Log(( "Action %s requires %d steps\n", 
          ActionName[A], NoOfActions ));
    for( int i = 0 ; i < NoOfActions; i ++ ) {
      // setState recurses through the tree depth first
      msg = getToplevel()->runtime()->setState( this, Actions[i], Force );
      if( ! msg.isEmpty() ) {
        return msg;
      }
    }
    return QString();
 }
+void NetworkSetup::copyFrom( const NetworkSetup & N ) {
+    Number = N.Number;
+    CurrentState = N.CurrentState;
+    Name = N.Name;
+    IsNew = N.IsNew;
+    Index = N.Index;
+    AssignedInterface = N.AssignedInterface;
+}
 //
 //
 // RuntimeInfo
 //
 //
-QString RuntimeInfo::setState( NodeCollection * NC, 
+QString RuntimeInfo::setState( NetworkSetup * NC, 
                               Action_t A, 
                               bool Force ) {
    QString M;
    RuntimeInfo * Deeper = nextNode();
    if( Deeper ) {
      // first go deeper
      M = Deeper->setState( NC, A, Force );
      if( ! M.isEmpty() ) 
        return M;
    }
    // set my own state
    Log (( "-> Act upon %s\n", netNode()->name() ));
    M = setMyState( NC, A, Force );
    Log (( "   result %s\n", M.latin1() ));
    return M;
 }
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index 151d546..8aebdc0 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -1,118 +1,118 @@
 #ifndef NETNODE_H
 #define NETNODE_H
 #include <qtextstream.h>
 #include <qlist.h>
 #include <qdict.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qobject.h>
 #include <time.h>
 #include <Utils.h>
 #include <system.h>
 // difference feature interfaces
 class AsDevice;
 class AsLine;
-class AsConnection;
+class AsNetworkSetup;
 class AsFullSetup;
 // needed for plugin creation function
 #include <qlist.h>
 class ANetNode;
 class ANetNodeInstance;
-class NodeCollection;
+class NetworkSetup;
 class QTextStream;
 class RuntimeInfo;
 class InterfaceInfo;
 class NSResources;
 extern QString & deQuote( QString & X );
 extern QString quote( QString X );
 #include "systemfile.h"
 typedef enum State {
    // if we have not yet detected the state of the device
    Unchecked = 0,
    // if we cannot determine the state
    Unknown = 1,
-    // if connection cannot be established e.g. because
+    // if networkSetup cannot be established e.g. because
    // the hardware is not available
    Unavailable = 2,
-    // if the connection cannot be establishec but NOT
+    // if the networkSetup cannot be establishec but NOT
    // because it is physically impossible but because
    // it has been disabled for FUNCTIONAL reasons
    Disabled = 3,
-    // if connection is available to is currently down
+    // if networkSetup is available to is currently down
    // i.e. the corresponding hardware is not activated
    Off = 4,
-    // if connection is available to be used (i.e. the
+    // if networkSetup is available to be used (i.e. the
    // devices if fully ready to be used
    Available = 5,
-    // if connection is being used
+    // if networkSetup is being used
    IsUp = 6
 } State_t;
 typedef enum Action {
    // to make the device unavailable functionally -> to disabled
    Disable = 0,
    // to make the device available functionally -> to off
    Enable = 1,
    // bring the hardware up -> to Available
    Activate = 2,
    // bring the hardware down -> to off
    Deactivate = 3,
-    // bring the connection up -> to IsUp
+    // bring the networkSetup up -> to IsUp
    Up = 4,
-    // bring the connection down -> to Available
+    // bring the networkSetup down -> to Available
    Down = 5
 } Action_t;
 class ANetNode : public QObject {
 public:
    typedef QArray<ANetNode *> NetNodeList;
    ANetNode( const char * Name ) : QObject( 0, Name ) {}
    virtual ~ANetNode(){};
    //
    //
    // standard methods with sensible default
    //
    //
    inline int done( void ) 
      { return Done; }
    inline void setDone( int D ) 
      { Done = D; }
-    // does this Node provide a Connection
+    // does this Node provide a NetworkSetup
    bool isToplevel( void );
    // set the value of an attribute
    void setAttribute( QString & Attr, QString & Value ) ;
    void saveAttributes( QTextStream & TS ) ;
    // compiled references to 'needed' NetNodes -> needs list
    inline void setAlternatives( NetNodeList * Alt )
      { Alternatives = Alt; }
    inline NetNodeList & alternatives( void ) 
      { return *Alternatives; }
    //
    //
    // Virtual methods with sensible default
    //
    //
    // do instances of this noce class have data for this file
    virtual bool hasDataForFile( SystemFile & ) 
      { return 0; }
    // open proper file SF identified by S
    // this method is called by NS2.  
@@ -224,52 +224,52 @@ public:
    void saveAttributes( QTextStream & TS ) ;
    // return true if node isntance is NEW and not loaded
    inline void setNew( bool IsN ) 
      { IsNew = IsN; }
    inline bool isNew( void ) 
      { return IsNew; }
    // return description for this instance
    inline QString & description( void ) 
      { return Description; }
    inline void setDescription( const QString & S ) 
      { Description = S; }
    // pixmap for this instance -> from NetNode
    inline const QString pixmapName( void )
      { return NodeType->pixmapName(); }
    inline const char ** provides( void )
      { return NodeType->provides(); }
    inline const char ** needs( void )
      { return NodeType->needs(); }
-    inline void setConnection( NodeCollection * NC ) 
+    inline void setNetworkSetup( NetworkSetup * NC ) 
-      { Connection = NC; }
+      { TheNetworkSetup = NC; }
-    inline NodeCollection * connection( void ) 
+    inline NetworkSetup * networkSetup( void ) 
-      { return Connection; }
+      { return TheNetworkSetup; }
    //
    //
    // Virtual methods with sensible defaults
    //
    //
    // open proper file identified by S
    virtual bool openFile( SystemFile & ) 
      { return 0; }
    // check if this node (or sub nodes) have data for this file
    virtual bool hasDataForFile( SystemFile & S ) 
      { return nodeClass()->hasDataForFile( S ); }
    // generate code specific for this node but embedded
    // in the section of the parent
    // this is called within the code of the parent
    virtual short generateFileEmbedded( SystemFile & SF,
                                       long DevNr ) 
      { ANetNodeInstance * NNI = nextNode();
        return (NNI) ? NNI->generateFileEmbedded( SF, DevNr ) : 1;
@@ -294,50 +294,50 @@ public:
    //
    //
    // return runtime information for this node
    virtual RuntimeInfo * runtime( void ) = 0;
    // create edit widget under parent
    virtual QWidget * edit( QWidget * parent ) = 0;
    // is given data acceptable
    virtual QString acceptable( void ) = 0;
    // get data from GUI and store in node
    virtual void commit( void ) = 0;
    // returns node specific data -> only useful for 'buddy'
    virtual void * data( void ) = 0;
 protected :
    virtual void setSpecificAttribute( QString & , QString & ) = 0;
    virtual void saveSpecificAttribute( QTextStream & ) = 0;
    ANetNode * NodeType;
-    // connection to which this node belongs to
+    // networkSetup to which this node belongs to
-    NodeCollection * Connection;
+    NetworkSetup * TheNetworkSetup;
    QString   Description;
    bool      IsModified;
    // true if this nodeinstance was just created (and not
    // loaded from file
    bool      IsNew;
    int       Done;
    static long InstanceCounter;
 };
 class ErrorNNI: public ANetNodeInstance {
 public:
    ErrorNNI( const QString & _Name ) : ANetNodeInstance( 0 ) {
      setName( _Name.latin1() );
    }
    RuntimeInfo * runtime( void ) {
      return 0;
    }
    // create edit widget under parent
    QWidget * edit( QWidget * parent ) {
@@ -357,49 +357,49 @@ public:
    void * data( void ) {
      return 0;
    }
 protected :
    void setSpecificAttribute( QString & , QString & ) {
    }
    void saveSpecificAttribute( QTextStream & ) {
    }
 };
 class RuntimeInfo : public QObject {
      Q_OBJECT
 public :
      RuntimeInfo( ANetNodeInstance * TheNNI )
        { NNI = TheNNI; }
      //
      //
-      // methods to be overloaded by connection capable
+      // methods to be overloaded by networkSetup capable
      // runtimes
      //
      //
      //
      //
      // methods to be overloaded by device capable
      // runtimes
      //
      //
      // does this node handles this interface e.g.eth0
      // recurse deeper if this node cannot answer that question
      virtual bool handlesInterface( const QString & S ) {
        RuntimeInfo * RI = device();
        if( RI ) {
          return RI->handlesInterface( S );
        }
        return 0;
      }
      bool handlesInterface( const InterfaceInfo & I ) {
        RuntimeInfo * RI = device();
        if( RI ) {
@@ -454,185 +454,188 @@ public :
          return (RI) ? RI->device() : 0;
        }
      // return the node that offers connection capability
      virtual RuntimeInfo * connection( void )
        { RuntimeInfo * RI = nextNode();
          return (RI) ? RI->connection() : 0;
        }
      // return the node that offers line capability
      virtual RuntimeInfo * line( void )
        { RuntimeInfo * RI = nextNode();
          return (RI) ? RI->line() : 0;
        }
      // return the node that offers full setup capability
      virtual RuntimeInfo * fullSetup( void )
        { RuntimeInfo * RI = nextNode();
          return (RI) ? RI->fullSetup() : 0;
        }
      inline ANetNodeInstance * netNode() 
        { return NNI; }
-      inline NodeCollection * nodeCollection() 
+      inline NetworkSetup * networkSetup() 
-        { return NNI->connection(); }
+        { return NNI->networkSetup(); }
      virtual State_t detectState( void ) = 0;
      // public API to set the state
-      virtual QString setState( NodeCollection * NC, 
+      virtual QString setState( NetworkSetup * NC, 
                                Action_t A, 
                                bool Force = 0 );
      inline RuntimeInfo * nextNode( void ) {
         ANetNodeInstance * NNI = netNode()->nextNode();
         return (NNI) ? NNI->runtime() : 0;
      }
 signals :
      // sent by device if state changes
      void stateChanged( State_t S, ANetNodeInstance * NNI );
 protected :
      // set state of this node (private API)
-      virtual QString setMyState( NodeCollection * NC, 
+      virtual QString setMyState( NetworkSetup * NC, 
                                Action_t A, 
                                bool Force = 0 ) = 0;
-      // connection this runtime info belongs to
+      // networkSetup this runtime info belongs to
      ANetNodeInstance * NNI;
 };
-class NodeCollection : public QList<ANetNodeInstance> {
+class NetworkSetup : public QList<ANetNodeInstance> {
 public :
-      NodeCollection( void );
+      NetworkSetup( void );
-      NodeCollection( QTextStream & TS, bool & Dangling );
+      NetworkSetup( QTextStream & TS, bool & Dangling );
-      ~NodeCollection( void );
+      ~NetworkSetup( void );
+      // copy settings from NC to this 
+      void copyFrom( const NetworkSetup & NC );
      inline int done( void ) 
        { return Done; }
      inline void setDone( int D ) 
        { Done = D; }
      inline int number( void ) 
        { return Number; }
      inline void setNumber( int i ) 
        { Number = i; }
      inline bool isNew( void ) 
        { return IsNew; }
      inline void setNew( bool N ) 
        { IsNew = N ; }
      inline bool isModified( void ) 
        { return IsModified; }
      inline void setModified( bool N ) 
        { IsModified = N ; }
      inline bool handlesInterface( const QString & S ) {
        return getToplevel()->runtime()->handlesInterface( S );
      }
      // return the interface in the OS that is assigned to
      // this device
      inline InterfaceInfo * assignedInterface( void ) {
        return AssignedInterface;
      }
      // assign the interface to this device
      inline void assignInterface( InterfaceInfo * NI ) {
-        if( NI == 0 ) {
+        // cleanup previous
-          if( AssignedInterface ) {
-            AssignedInterface->assignConnection( 0 );
-          }
-        }
-        AssignedInterface = NI;
        if( AssignedInterface ) {
-          AssignedInterface->assignConnection( this );
+          AssignedInterface->assignToNetworkSetup( 0 );
        }
+        if( NI ) {
+          // assign new
+          NI->assignToNetworkSetup( this );
+        }
+        AssignedInterface = NI;
      }
      inline RuntimeInfo * device() {
        return getToplevel()->runtime()->device();
      }
      const QStringList & triggers();
      State_t state( bool Update = 0 );
      // get the ixmap for this device
      QPixmap devicePixmap( void );
      QPixmap statePixmap( State_t S );
      inline QPixmap statePixmap( bool Update = 0 ) 
        { return statePixmap( state(Update) ); }
      QString stateName( State_t );
      inline QString stateName( bool Update = 0 ) 
        { return stateName( state(Update) ); }
      QString setState( Action_t A, bool Force = 0 );
      void save( QTextStream & TS );
      void append( ANetNodeInstance * NNI );
-      // makes sure that all items in the connection point to 
+      // makes sure that all items in the networkSetup point to 
      // that connectoin
      void reassign( void );
      ANetNodeInstance * getToplevel( void );
      ANetNodeInstance * findNext( ANetNodeInstance * NNI );
      ANetNodeInstance * findByName( const QString & S );
      inline const QString & name()
        { return Name; }
      const QString & description( void );
      inline void setName( const QString & N)
        { Name = N; }
      inline State_t currentState( void )
        { return CurrentState; }
      inline void setCurrentState( State_t S )
        { CurrentState = S; }
      // return TRUE if this node can have data to be inserted in 
      // file identified by S
      bool hasDataForFile( SystemFile & S );
      ANetNodeInstance * firstWithDataForFile( SystemFile & );
      // generate items for this file -> toplevel call
      short generateFile( SystemFile & SF,
                         long DN // device number
                       )
        { return getToplevel()->generateFile( SF, DN ); }
      bool triggeredBy( const QString & Trigger )
        { return getToplevel()->triggeredBy( Trigger ); }
 private :
      int compareItems ( QCollection::Item item1, 
                         QCollection::Item item2 );
      long Number;
-      // state of this connection
+      // state of this networkSetup
      State_t CurrentState;
      QString Name;
      // true if this collection was just created (and not
      // loaded from file
      bool    IsNew;
      // index in listbox
      int     Index;
      bool    IsModified;
      int     Done;
      InterfaceInfo * AssignedInterface;
 };
 #endif
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp
index b81dcaa..0e72c25 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.cpp
+++ b/noncore/settings/networksettings2/networksettings2/resources.cpp
@@ -4,49 +4,49 @@
 #include <pwd.h>
 #include <qpixmap.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/odebug.h>
 #include <opie2/opluginloader.h>
 #include <qtopia/resource.h>
 #include "netnode.h"
 #include "resources.h"
 #include "netnodeinterface.h"
 #define PLUGINDIR "plugins/networksettings2"
 #define ICONDIR "/pics/networksettings2/"
 // single resources instance
 TheNSResources * _NSResources = 0;
 TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
-        ConnectionsMap(), DanglingConnectionsMap() {
+        NetworkSetupsMap(), DanglingNetworkSetupsMap() {
    _NSResources = this;
    detectCurrentUser();
    // load available netnodes
    Plugins = 0;
    findAvailableNetNodes();
    // compile provides and needs lists
    { const char ** NeedsRun;
      QDictIterator<ANetNode> OuterIt( AllNodeTypes );
      bool Done;
      for ( ; OuterIt.current(); ++OuterIt ) {
        // find needs list
        ANetNode::NetNodeList * NNLP = new ANetNode::NetNodeList;
        ANetNode::NetNodeList & NNL = *(NNLP);
        // must iterate this way to avoid duplication pointers
        for ( QDictIterator<ANetNode> InnerIt( AllNodeTypes );
              InnerIt.current(); ++InnerIt ) {
@@ -59,54 +59,54 @@ TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
          for( ; *NeedsRun; NeedsRun ++ ) {
            const char ** PRun;
            PRun = Provides;
            for( ; *PRun; PRun ++ ) {
              if( strcmp( *PRun, *NeedsRun ) == 0 ) {
                // inner provides what outer needs
                NNL.resize( NNL.size() + 1 );
                NNL[NNL.size()-1] = InnerIt.current();
                Done = 1; // break from 2 loops
                break;
              }
            }
          }
        }
        OuterIt.current()->setAlternatives( NNLP );
      }
    }
    // define built in Node types to Description map
    addNodeType( "device", tr( "Network Device" ),
         tr( "<p>Devices that can handle IP packets</p>" ) );
    addNodeType( "line", tr( "Character device" ),
         tr( "<p>Devices that can handle single bytes</p>" ) );
-    addNodeType( "connection", tr( "IP Connection" ),
+    addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ),
-         tr( "<p>Nodes that provide working IP connections</p>" ) );
+         tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) );
-    addNodeType( "fullsetup", tr( "Connection Profile" ),
+    addNodeType( "fullsetup", tr( "NetworkSetup Profile" ),
-         tr( "<p>Fully configured connection profile</p>" ) );
+         tr( "<p>Fully configured NetworkSetup profile</p>" ) );
-    addNodeType( "GPRS", tr( "Connection to GPRS device" ),
+    addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ),
-         tr( "<p>Connection to a GPRS capable device</p>" ) );
+         tr( "<p>NetworkSetup to a GPRS capable device</p>" ) );
    // get access to the system
    TheSystem = new System();
 }
 TheNSResources::~TheNSResources( void ) {
    if( Plugins ) {
      delete Plugins;
      delete PluginManager;
    }
    delete TheSystem;
 }
 void TheNSResources::addNodeType( const QString & ID, 
                                     const QString & Name,
                                     const QString & Descr ) {
    if( NodeTypeNameMap[ID].isEmpty() ) {
      NodeTypeNameMap.insert( ID, Name );
      NodeTypeDescriptionMap.insert( ID, Descr );
    }
 }
@@ -180,159 +180,159 @@ void TheNSResources::findAvailableNetNodes( void ){
          continue;
        }
        // merge this node with global node
        for( QListIterator<ANetNode> it(PNN);
             it.current();
             ++it ) {
          AllNodeTypes.insert( it.current()->name(), it.current() );
        }
      }
      // load the translation 
      QTranslator *trans = new QTranslator(qApp);
      QString fn = QPEApplication::qpeDir()+
                "/i18n/"+lang+"/"+ (*it).name() + ".qm";
      if( trans->load( fn ) )
          qApp->installTranslator( trans );
      else
          delete trans;
    }
 }
-// used to find unique connection number
+// used to find unique NetworkSetup number
-int TheNSResources::assignConnectionNumber( void ) {
+int TheNSResources::assignNetworkSetupNumber( void ) {
      bool found = 1;
      for( int trial = 0; ; trial ++ ) {
        found = 1; 
-        for( QDictIterator<NodeCollection> it(ConnectionsMap);
+        for( QDictIterator<NetworkSetup> it(NetworkSetupsMap);
             it.current();
             ++it ) {
          if( it.current()->number() == trial ) {
            found = 0;
            break;
          }
        }
        if( found ) {
          Log(("Assign profile number %d\n", trial ));
          return trial;
        }
      }
 }
 QPixmap TheNSResources::getPixmap( const QString & QS ) {
    QPixmap P;
    QString S("networksettings2/");
    S += QS;
    P = Resource::loadPixmap( S );
    if( P.isNull() ) {
      Log(( "Cannot load %s\n", S.latin1() ));
    }
    return ( P.isNull() ) ? QPixmap() : P;
 }
 QString TheNSResources::tr( const char * s ) {
    return qApp->translate( "resource", s );
 }
 const QString & TheNSResources::netNode2Name( const char * s ) {
    return NodeTypeNameMap[s];
 }
 const QString & TheNSResources::netNode2Description( const char * s ) {
    return NodeTypeDescriptionMap[s];
 }
-void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) {
+void TheNSResources::addNetworkSetup( NetworkSetup * NC, bool Dangling ) {
      ANetNodeInstance * NNI;
-      Log(( "Add Connection %s, Dangling %d\n",
+      Log(( "Add NetworkSetup %s, Dangling %d\n",
          NC->name().latin1(), Dangling ));
      if( Dangling ) {
-        DanglingConnectionsMap.insert( NC->name(), NC );
+        DanglingNetworkSetupsMap.insert( NC->name(), NC );
      } else {
-        ConnectionsMap.insert( NC->name(), NC );
+        NetworkSetupsMap.insert( NC->name(), NC );
      }
      // add (new) nodes to NodeList
      for( QListIterator<ANetNodeInstance> it(*NC);
           it.current();
           ++it ) {
        NNI = it.current();
        if( findNodeInstance( NNI->name() ) == 0 ) {
          // new item
          addNodeInstance( NNI );
        }
      }
 }
-void TheNSResources::removeConnection( const QString & N ) {
+void TheNSResources::removeNetworkSetup( const QString & N ) {
-      NodeCollection * NC = findConnection( N );
+      NetworkSetup * NC = findNetworkSetup( N );
      if( ! NC )
        return;
-      // delete netnodes in this connection
+      // delete netnodes in this NetworkSetup
      ANetNodeInstance * NNI;
      for( NNI = NC->first(); NNI != 0; NNI = NC->next() ) {
        removeNodeInstance( NNI->name() );
      }
-      if( ConnectionsMap.find( N ) ) {
+      if( NetworkSetupsMap.find( N ) ) {
-        ConnectionsMap.remove( N ); 
+        NetworkSetupsMap.remove( N ); 
      } else {
-        DanglingConnectionsMap.remove( N ); 
+        DanglingNetworkSetupsMap.remove( N ); 
      }
 }
-// dangling connections are filtered out
+// dangling NetworkSetups are filtered out
-NodeCollection * TheNSResources::findConnection( const QString & S ) {
+NetworkSetup * TheNSResources::findNetworkSetup( const QString & S ) {
-      return ConnectionsMap[ S ];
+      return NetworkSetupsMap[ S ];
 }
-NodeCollection *  TheNSResources::getConnection( int nr ) {
+NetworkSetup *  TheNSResources::getNetworkSetup( int nr ) {
-      for( QDictIterator<NodeCollection> it(ConnectionsMap);
+      for( QDictIterator<NetworkSetup> it(NetworkSetupsMap);
           it.current();
           ++it ) {
        if( it.current()->number() == nr ) {
          return it.current();
        }
      }
      return 0;
 }
 /*
-void TheNSResources::renumberConnections( void ) {
+void TheNSResources::renumberNetworkSetups( void ) {
-      Name2Connection_t & M = NSResources->connections();
+      Name2NetworkSetup_t & M = NSResources->NetworkSetups();
-      NodeCollection * NC;
+      NetworkSetup * NC;
-      // for all connections
+      // for all NetworkSetups
-      NodeCollection::resetMaxNr();
+      NetworkSetup::resetMaxNr();
-      for( QDictIterator<NodeCollection> it(M);
+      for( QDictIterator<NetworkSetup> it(M);
           it.current();
           ++it ) {
        NC = it.current();
-        NC->setNumber( NC->maxConnectionNumber()+1 );
+        NC->setNumber( NC->maxNetworkSetupNumber()+1 );
        NC->setModified( 1 );
      }
 }
 */
 typedef struct EnvVars {
      char * Name;
      int Len;
 } EnvVar_t;
 #define AnEV(x) x, sizeof(x)-1
 static EnvVar_t EV[] = {
    AnEV( "HOME" ),
    AnEV( "LOGNAME" ),
    AnEV( "USER" ),
    AnEV( "LD_LIBRARY_PATH" ),
    AnEV( "PATH" ),
    AnEV( "QTDIR" ),
    AnEV( "OPIEDIR" ),
    AnEV( "SHELL" ),
    { NULL, 0 }
 };
diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h
index 51c4250..f7393d3 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.h
+++ b/noncore/settings/networksettings2/networksettings2/resources.h
@@ -19,135 +19,135 @@ namespace Opie {
        class OPluginLoader;
        class OPluginManager;
    }
 }
 typedef void (*GetNetNodeListFt_t)(QList<ANetNode>& PNN );
 class CurrentQPEUser {
 public :
        CurrentQPEUser() : UserName(), HomeDir(), EnvList() {}
        inline bool known( void )
          { return ! HomeDir.isEmpty() && ! UserName.isEmpty(); }
        QString        UserName;
        QString        HomeDir;
        int            Uid;
        int            Gid;
        QArray<char *> EnvList;
 };
 typedef QDict<ANetNode>  Name2NetNode_t;
 typedef QDict<ANetNodeInstance > Name2Instance_t;
-typedef QDict<NodeCollection> Name2Connection_t;
+typedef QDict<NetworkSetup> Name2NetworkSetup_t;
 typedef QDict<SystemFile> Name2SystemFile_t;
 class TheNSResources {
 public :
    TheNSResources( void );
    ~TheNSResources( );
    // give busy feedback
    void busy( bool B );
    System & system()
      { return *TheSystem; }
-    int assignConnectionNumber(void);
+    int assignNetworkSetupNumber(void);
    QPixmap getPixmap( const QString & Name );
    Name2NetNode_t & netNodes( void ) 
      { return AllNodeTypes; }
    bool netNodeExists( const QString & X )
      { return AllNodeTypes.find(X)!=0; }
    ANetNode * findNetNode( const QString & N )
      { return AllNodeTypes.find(N);
      }
    // define new plugin (=node)
    void addNodeType( const QString & ID,
                      const QString & LongName,
                      const QString & Description );
    Name2SystemFile_t & systemFiles( void )
      { return SystemFiles; }
    void addSystemFile( const QString & ID, 
                        const QString & P,
                        bool KDI );
    ANetNodeInstance * createNodeInstance( const QString & S )
      { ANetNode * NN = findNetNode( S );
        Log(( "Find node type %s : %p\n", S.latin1(), NN ));
        if( NN == 0 ) 
          // type of this instance not found
          return 0;
        ANetNodeInstance * NNI = NN->createInstance();
        NNI->initialize();
        return NNI;
      }
    Name2Instance_t & netNodeInstances( void ) 
      { return AllNodes; }
    void addNodeInstance( ANetNodeInstance * I )
      { AllNodes.insert( I->name(), I ); }
    void removeNodeInstance( const QString & N )
      { AllNodes.remove( N );}
    ANetNodeInstance * findNodeInstance( const QString & S )
      { return AllNodes[S]; }
    const QString & netNode2Name( const char * Type );
    const QString & netNode2Description( const char * Type );
-    void addConnection( NodeCollection * NC, bool Dangling );
+    void addNetworkSetup( NetworkSetup * NC, bool Dangling );
-    void removeConnection( const QString & N );
+    void removeNetworkSetup( const QString & N );
-    NodeCollection * findConnection( const QString & N );
+    NetworkSetup * findNetworkSetup( const QString & N );
-    NodeCollection * getConnection( int nr );
+    NetworkSetup * getNetworkSetup( int nr );
-    Name2Connection_t & connections( void )
+    Name2NetworkSetup_t & networkSetups( void )
-      { return ConnectionsMap; }
+      { return NetworkSetupsMap; }
-    Name2Connection_t & danglingConnections( void )
+    Name2NetworkSetup_t & danglingNetworkSetups( void )
-      { return DanglingConnectionsMap; }
+      { return DanglingNetworkSetupsMap; }
    inline bool userKnown( void )
      { return CurrentUser.known(); }
    CurrentQPEUser & currentUser( void )
      { return CurrentUser; }
 private :
    void detectCurrentUser( void );
    QString tr( const char * path );
    void findAvailableNetNodes( void );
    QMap< QString, QString>   NodeTypeNameMap;
    QMap< QString, QString>   NodeTypeDescriptionMap;
-    // list of connections that are valid
+    // list of networkSetups that are valid
-    Name2Connection_t         ConnectionsMap;
+    Name2NetworkSetup_t         NetworkSetupsMap;
-    // list of connection configurations that are not valid
+    // list of networkSetup configurations that are not valid
    // e.g. because plugins are missing
-    Name2Connection_t         DanglingConnectionsMap;
+    Name2NetworkSetup_t         DanglingNetworkSetupsMap;
    System *                  TheSystem;
    Name2SystemFile_t         SystemFiles;
    // all node type classes 
    Name2NetNode_t            AllNodeTypes;
    // all nodes
    Name2Instance_t           AllNodes;
    CurrentQPEUser            CurrentUser;
    Opie::Core::OPluginLoader *  Plugins;
    Opie::Core::OPluginManager * PluginManager;
 };
 extern TheNSResources * _NSResources;
 #define NSResources _NSResources
 #endif
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp
index a290f08..33cc5bd 100644
--- a/noncore/settings/networksettings2/networksettings2/system.cpp
+++ b/noncore/settings/networksettings2/networksettings2/system.cpp
@@ -432,55 +432,55 @@ void System::probeInterfaces( void ) {
      } else {
        IFI->Address = "";
        IFI->IsUp = 0;
      }
      if( ioctl(sockfd, SIOCGIFBRDADDR, &ifrs) >= 0 ) {
        IFI->BCastAddress = 
           inet_ntoa(((struct sockaddr_in*)&ifrs.ifr_broadaddr)->sin_addr);
      } else {
        IFI->BCastAddress = "";
      }
      if( ioctl(sockfd, SIOCGIFNETMASK, &ifrs) >= 0 ) {
        IFI->Netmask = 
           inet_ntoa(((struct sockaddr_in*)&ifrs.ifr_netmask)->sin_addr);
      } else {
        IFI->Netmask = "";
      }
      Log(("NIC %s UP ? %d\n", NicName.latin1(), IFI->IsUp ));
    }
    ::close( sockfd );
 }
 InterfaceInfo * System::findInterface( const QString & N ) {
      InterfaceInfo * Run;
-      // has PAN connection UP interface ?
+      // has PAN NetworkSetup UP interface ?
      for( QDictIterator<InterfaceInfo> It(ProbedInterfaces);
           It.current();
           ++It ) {
        Run = It.current();
        if( N == Run->Name ) {
-          // this PAN connection is up
+          // this PAN NetworkSetup is up
          return Run;
        }
      }
      return 0;
 }
 #include <stdarg.h>
 static FILE * logf = 0;
 void VLog( char * Format, ... ) {
      va_list l;
      va_start(l, Format );
      if( logf == (FILE *)0 ) {
        QString S = getenv("NS2LOG");
        if( S == "stderr" ) {
          logf = stderr;
        } else if( S.isEmpty() ) {
          logf = fopen( "/tmp/ns2log", "a" );
        } else {
          logf = fopen( S, "a" );
        }
diff --git a/noncore/settings/networksettings2/networksettings2/system.h b/noncore/settings/networksettings2/networksettings2/system.h
index ebee0d5..794b868 100644
--- a/noncore/settings/networksettings2/networksettings2/system.h
+++ b/noncore/settings/networksettings2/networksettings2/system.h
@@ -1,40 +1,40 @@
 #ifndef __SYSTEM__H
 #define __SYSTEM__H
 #include <qstring.h>
 #include <opie2/oprocess.h>
 using namespace Opie::Core;
 // for hardware types
 #include <net/if_arp.h>
 #include <qdict.h>
 #include <qobject.h>
 #include <stdio.h>
-class NodeCollection;
+class NetworkSetup;
 class ANetNodeInstance;
 class QFile;
 class MyProcess : public QObject {
      Q_OBJECT
 public :
      MyProcess();
      ~MyProcess();
      inline OProcess & process()
        { return *P; }
      inline void setEchoMode( bool M ) {
        EchoMode = M;
      }
 public slots :
      void SLOT_Stdout( Opie::Core::OProcess * P, char *, int );
      void SLOT_Stderr( Opie::Core::OProcess * P, char *, int );
      void SLOT_ProcessExited( Opie::Core::OProcess * P);
@@ -45,55 +45,55 @@ signals :
      void stderrLine( const QString & );
      void processExited( MyProcess * );
 private :
      QString StdoutBuffer;
      QString StderrBuffer;
      OProcess * P;
      // output all output to my output
      bool EchoMode;
 };
 class InterfaceInfo {
 public :
        InterfaceInfo() :
            Name(),
            MACAddress(),
            BCastAddress(),
            Netmask(),
            DstAddress() {
        }
-        NodeCollection * assignedConnection()
+        NetworkSetup * assignedToNetworkSetup()
          { return Collection; }
-        void assignConnection( NodeCollection * NNI )
+        void assignToNetworkSetup( NetworkSetup * NNI )
          { Collection = NNI; }
-        NodeCollection * Collection;    // connection taking care of me
+        NetworkSetup * Collection;    // networkSetup taking care of me
        QString Name;                   // name of interface
        int     CardType;               // type of card
        QString MACAddress;             // MAC address
        QString Address;                // IP Address
        QString BCastAddress;           // Broadcast Address
        QString Netmask;                // Netmask
        QString DstAddress;             // Peer address (if P-t-P)
        bool    IsUp;                   // interface is UP
        bool    HasMulticast;           // Supports Multicast
        bool    IsPointToPoint;         // IsPointToPoint card
        QString RcvBytes;
        QString SndBytes;
        QString RcvErrors;
        QString SndErrors;
        QString RcvDropped;
        QString SndDropped;
        QString Collisions;
 };
 class System : public QObject {
      Q_OBJECT
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index 39031ed..b4622fc 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -29,119 +29,119 @@ NetworkSettingsData::NetworkSettingsData( void ) {
    // load settings
    loadSettings();
    // assign interfaces by scanning /tmp/profile-%s.Up files
    { QDir D( "/tmp" );
      QFile * F = new QFile;
      int profilenr;
      QString interfacename;
      QTextStream TS ( F );
      QStringList SL = D.entryList( "profile-*.up");
      Log(( "System reports %d interfaces. Found %d up\n", 
          NSResources->system().interfaces().count(),
          SL.count() ));
      for ( QStringList::Iterator it = SL.begin(); 
            it != SL.end(); 
            ++it ) {
        profilenr = atol( (*it).mid( 8 ).latin1() );
        // read the interface store int 'up'
        F->setName( D.path() + "/" + (*it) );
        if( F->open( IO_ReadOnly ) ) {
-          NodeCollection * NC;
+          NetworkSetup * NC;
          interfacename = TS.readLine();
          F->close();
          Log(( "Assign interface %s to Profile nr %d\n", 
                interfacename.latin1(), profilenr ));
-          NC = NSResources->getConnection( profilenr );
+          NC = NSResources->getNetworkSetup( profilenr );
          if( NC ) {
            NC->assignInterface( 
                NSResources->system().findInterface( interfacename ) );
            Log(( "Assign interface %p\n", 
                  NC->assignedInterface() ));
          } else {
            Log(( "Profile nr %d no longer defined\n", 
                profilenr ));
          }
        }
      }
    }
 }
 // saving is done by caller
 NetworkSettingsData::~NetworkSettingsData( void ) {
    delete NSResources;
 }
 void NetworkSettingsData::loadSettings( void ) {
    QString Line, S;
    QString Attr, Value;
    long idx;
    QFile F( CfgFile );
    QTextStream TS( &F );
    ForceModified = 0;
    do {
      if( ! F.open(IO_ReadOnly) )
        break;
      /* load the file ->
         FORMAT :
           [NETNODETYPE] 
           Entries ...
           <EMPTYLINE>
-           [connection] 
+           [NetworkSetup] 
           Name=Name
           Node=Name
           <EMPTYLINE>
      */
      while( ! TS.atEnd() ) {
        S = Line = TS.readLine();
        if ( S.isEmpty() || S[0] != '[' )
          continue;
        S = S.mid( 1, S.length()-2 );
        if( ! NSResources ) {
          continue;
        }
-        if( S == "connection" ) {
+        if( S == "NetworkSetup" ) {
-          // load connections -> collections of nodes
+          // load NetworkSetups -> collections of nodes
          bool Dangling;
-          NodeCollection * NC = new NodeCollection( TS, Dangling );
+          NetworkSetup * NC = new NetworkSetup( TS, Dangling );
-          NSResources->addConnection( NC, Dangling );
+          NSResources->addNetworkSetup( NC, Dangling );
        } else {
          ANetNode * NN = 0;
          ANetNodeInstance* NNI = 0;
          if( S.startsWith( "nodetype " ) ) {
            S = S.mid( 9, S.length()-9 );
            S = deQuote(S);
            // try to find netnode
            NN = NSResources->findNetNode( S );
          } else {
            // try to find instance
            NNI = NSResources->createNodeInstance( S );
          }
          if( NN == 0 && NNI == 0 ) {
            LeftOvers.append( Line );
            do {
              Line = TS.readLine();
              // store even delimiter
              LeftOvers.append( Line );
            } while ( ! Line.isEmpty() );
            //next section 
            continue;
          } 
@@ -230,94 +230,94 @@ QString NetworkSettingsData::saveSettings( void ) {
    // save leftovers
    for ( QStringList::Iterator it = LeftOvers.begin(); 
          it != LeftOvers.end(); ++it ) {
      TS << (*it) << endl;
    }
    // save all netnode instances
    { ANetNodeInstance * NNI;
      for( QDictIterator<ANetNodeInstance> nit( 
                          NSResources->netNodeInstances()); 
           nit.current();
           ++nit ) {
        // header
        NNI = nit.current();
        TS << '[' 
           << QString(NNI->nodeClass()->name()) 
           << ']' 
           << endl;
        NNI->saveAttributes( TS );
        TS << endl;
      }
    }
-    // good connections
+    // good NetworkSetups
-    { Name2Connection_t & M = NSResources->connections();
+    { Name2NetworkSetup_t & M = NSResources->networkSetups();
-      // for all connections
+      // for all NetworkSetups
-      for( QDictIterator<NodeCollection> it(M);
+      for( QDictIterator<NetworkSetup> it(M);
           it.current();
           ++it ) {
-        TS << "[connection]" << endl;
+        TS << "[NetworkSetup]" << endl;
        it.current()->save(TS);
      }
    }
-    // save dangling connections
+    // save dangling NetworkSetups
-    { Name2Connection_t & M = NSResources->danglingConnections();
+    { Name2NetworkSetup_t & M = NSResources->danglingNetworkSetups();
-      // for all connections
+      // for all NetworkSetups
-      for( QDictIterator<NodeCollection> it(M);
+      for( QDictIterator<NetworkSetup> it(M);
           it.current();
           ++it ) {
-        TS << "[connection]" << endl;
+        TS << "[NetworkSetup]" << endl;
        it.current()->save(TS);
      }
    }
    QDir D(".");
    D.rename( CfgFile + ".bup", CfgFile );
    //
    // proper files AND system files regenerated
    //
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
         it.current();
         ++it ) {
      it.current()->setModified( 0 );
    }
    return ErrS;
 }
 QString NetworkSettingsData::generateSettings( void ) {
    QString S = "";
    Name2SystemFile_t & SFM = NSResources->systemFiles();
-    Name2Connection_t & M = NSResources->connections();
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
-    NodeCollection * NC;
+    NetworkSetup * NC;
    ANetNodeInstance * NNI;
    ANetNodeInstance * FirstWithData;
    RuntimeInfo * CurDev;
    ANetNode * NN, * CurDevNN = 0;
    long NoOfDevs;
    long DevCtStart;
    bool needToGenerate;
    // regenerate system files
    Log( ( "Generating settings from %s\n", CfgFile.latin1()  ));
    for( QDictIterator<ANetNode> nnit( NSResources->netNodes() );
         nnit.current();
         ++nnit ) {
      bool FirstItem = 1;
      bool Generated = 0;
      CurDevNN = nnit.current();
      { QStringList SL;
        SL = CurDevNN->properFiles();
        for ( QStringList::Iterator it = SL.begin(); 
              it != SL.end(); 
@@ -407,49 +407,49 @@ QString NetworkSettingsData::generateSettings( void ) {
    //
    // generate all registered files
    //
    for( QDictIterator<SystemFile> sfit(SFM);
         sfit.current();
         ++sfit ) {
      SystemFile * SF;
      SF = sfit.current();
      // reset all 
      for( QDictIterator<ANetNode> nnit( NSResources->netNodes() );
           nnit.current();
           ++nnit ) {
        nnit.current()->setDone(0);
      }
      for( QDictIterator<ANetNodeInstance> nniit(
                  NSResources->netNodeInstances() );
           nniit.current();
           ++nniit ) {
        nniit.current()->setDone(0);
      }
-      for( QDictIterator<NodeCollection> ncit(M);
+      for( QDictIterator<NetworkSetup> ncit(M);
           ncit.current();
           ++ncit ) {
        ncit.current()->setDone(0);
      }
      Log( ( "Generating system file %s\n", SF->name().latin1() ));
      needToGenerate = 0;
      // are there netnodes that have instances and need 
      // to write data in this system file ?
      for( QDictIterator<ANetNode> nnit( NSResources->netNodes() );
           ! needToGenerate && nnit.current();
           ++nnit ) {
        NN = nnit.current();
        if( NN->hasDataForFile( *SF ) ) {
          // netnode can have data
          // are there instances of this node ?
          for( QDictIterator<ANetNodeInstance> nniit(
                      NSResources->netNodeInstances() );
               ! needToGenerate && nniit.current();
@@ -467,71 +467,71 @@ QString NetworkSettingsData::generateSettings( void ) {
      if( ! needToGenerate ) {
        // no instances found that might need to write data
        // in this systemfile
        Log(("No nodes for systemfile %s\n", SF->name().latin1() ));
        continue;
      }
      // ok generate this system file
      if( ! SF->open() ) {
        S = qApp->translate( "NetworkSettings", 
                             "<p>Cannot open system file \"%1\"</p>" ).
            arg( SF->name() );
        return S;
      }
      // global presection for this system file
      if( ! SF->preSection() ) {
        S = qApp->translate( "NetworkSettings", 
                             "<p>Error in section \"Preamble\" for file \"%1\"</p>" ).
            arg( SF->name() );
        return S;
      }
-      // find connections that want to write to this file
+      // find NetworkSetups that want to write to this file
-      for( QDictIterator<NodeCollection> ncit(M);
+      for( QDictIterator<NetworkSetup> ncit(M);
           ncit.current();
           ++ncit ) {
        NC = ncit.current();
        if( NC->done() ) {
          // already done
          continue;
        }
        if( ! NC->hasDataForFile( *SF ) ) {
          // no data
          continue;
        }
-        Log(("Generating %s for connection %s\n",
+        Log(("Generating %s for NetworkSetup %s\n",
              SF->name().latin1(), NC->name().latin1() ));
        // find highest item that wants to write data to this file
        FirstWithData = NC->firstWithDataForFile( *SF );
-        // find device on which this connection works
+        // find device on which this NetworkSetup works
        CurDev = NC->device();
        // class of that node
        CurDevNN = CurDev->netNode()->nodeClass();
        if( ! FirstWithData->nodeClass()->done() ) {
          // generate fixed part 
          if( ! SF->preDeviceSection( CurDevNN ) ) {
            S = qApp->translate( "NetworkSettings", 
                                 "<p>Error in section \"Pre-Device\" for file \"%1\"</p>" ).
                arg( SF->name() );
            return S;
          }
          if( FirstWithData->nodeClass()->generateFile( 
                                            *SF, 
                                            FirstWithData,
                                            -2 ) == 2 ) {
            S = qApp->translate( "NetworkSettings", 
              "<p>Error in section \"Common\" for file \"%1\" and node \"%2\"</p>" ).
                arg( SF->name() ).
                arg( CurDevNN->name() );
            return S;
          }
          FirstWithData->nodeClass()->setDone( 1 );
@@ -550,59 +550,59 @@ QString NetworkSettingsData::generateSettings( void ) {
        if( ! CurDev->netNode()->nodeClass()->done() ) {
          // first time this device is handled
          // generate common device specific part
          for( int i = DevCtStart; i < NoOfDevs ; i ++ ) {
            if( FirstWithData->nodeClass()->generateFile( 
                *SF, CurDev->netNode(), i ) == 2 ) {
              S = qApp->translate( "NetworkSettings", 
                "<p>Error in section \"Device\" for file \"%1\" and node \"%2\"</p>" ).
                  arg( SF->name() ).
                  arg( CurDevNN->name() );
              return S;
            }
          }
          CurDev->netNode()->nodeClass()->setDone( 1 );
          Log(( "Systemfile %s for Nodeclass %s is done\n",
            SF->name().latin1(),
            CurDev->netNode()->nodeClass()->name()
            ));
        }
        // generate profile specific info
-        // for all nodeconnections that work on the same device
+        // for all nodeNetworkSetups that work on the same device
-        for( QDictIterator<NodeCollection> ncit2(M);
+        for( QDictIterator<NetworkSetup> ncit2(M);
             ncit2.current();
             ++ncit2 ) {
          if( ncit2.current()->device() != CurDev ) {
            // different device
            continue;
          }
-          Log(("Connection %s of family %s\n", 
+          Log(("NetworkSetup %s of family %s\n", 
                ncit2.current()->name().latin1(), 
                CurDev->name() ));
          // generate 
          NNI = ncit2.current()->firstWithDataForFile( *SF );
          for( int i = DevCtStart; i < NoOfDevs ; i ++ ) {
            if( ! SF->preNodeSection( NNI, i ) ) {
              S = qApp->translate( "NetworkSettings", 
                  "<p>Error in \"Pre-Node Part\" for file \"%1\" and node \"%2\"</p>" ).
                  arg( SF->name() ).
                  arg( CurDevNN->name() );
              return S;
            }
            switch( NNI->generateFile( *SF, i ) ) {
              case 0 :
                (*SF) << endl;
                break;
              case 1 :
                break;
              case 2 :
                S = qApp->translate( "NetworkSettings", 
                  "<p>Error in section \"Node\" for file \"%1\" and node \"%2\"</p>" ).
                    arg( SF->name() ).
                    arg( CurDevNN->name() );
@@ -624,164 +624,164 @@ QString NetworkSettingsData::generateSettings( void ) {
      }
      if( ! SF->postDeviceSection( CurDevNN ) ) {
        S = qApp->translate( "NetworkSettings", 
            "<p>Error in section \"Post-Device\" for file \"%1\" and node \"%2\"</p>" ).
                arg( SF->name() ).
                arg( CurDevNN->name() );
        return S;
      }
      if( ! SF->postSection() ) {
        S = qApp->translate( "NetworkSettings", 
                "<p>Error in section \"Closure\" for file \"%1\"</p>" ).
                  arg( SF->name() );
        return S;
      }
      // end of file
      SF->close();
    }
    return S;
 }
-QList<NodeCollection> NetworkSettingsData::collectPossible( 
+QList<NetworkSetup> NetworkSettingsData::collectPossible( 
                    const QString & Interface ) {
-    // collect connections that can work on top of this interface
+    // collect NetworkSetups that can work on top of this interface
-    NodeCollection * NC;
+    NetworkSetup * NC;
-    QList<NodeCollection> PossibleConnections;
+    QList<NetworkSetup> PossibleNetworkSetups;
-    Name2Connection_t & M = NSResources->connections();
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
-    // for all connections
+    // for all NetworkSetups
-    for( QDictIterator<NodeCollection> it(M);
+    for( QDictIterator<NetworkSetup> it(M);
         it.current();
         ++it ) {
      NC = it.current();
      // check if this profile handles the requested interface
      if( NC->handlesInterface( Interface ) && // if different Intf.
          NC->state() != Disabled && // if enabled
          NC->state() != IsUp  // if already used
        ) {
        Log( ( "Append %s for %s\n", 
              NC->name().latin1(), Interface.latin1() ));
-        PossibleConnections.append( NC );
+        PossibleNetworkSetups.append( NC );
      }
    }
-    return PossibleConnections;
+    return PossibleNetworkSetups;
 }
 /*
    Called by the system to see if interface can be brought UP
    if allowed, echo Interface-allowed else Interface-disallowed
 */
 bool NetworkSettingsData::canStart( const QString & Interface ) {
    // load situation
-    NodeCollection * NC = 0;
+    NetworkSetup * NC = 0;
-    QList<NodeCollection> PossibleConnections;
+    QList<NetworkSetup> PossibleNetworkSetups;
-    PossibleConnections = collectPossible( Interface );
+    PossibleNetworkSetups = collectPossible( Interface );
    Log( ( "for %s : Possiblilies %d\n", 
-        Interface.latin1(), PossibleConnections.count() ));
+        Interface.latin1(), PossibleNetworkSetups.count() ));
-    switch( PossibleConnections.count() ) {
+    switch( PossibleNetworkSetups.count() ) {
-      case 0 : // no connections
+      case 0 : // no NetworkSetups
        break;
-      case 1 : // one connection
+      case 1 : // one NetworkSetup
-        NC = PossibleConnections.first();
+        NC = PossibleNetworkSetups.first();
        break;
      default : // need to ask user ?
        return 1;
    }
    if( NC ) {
      switch( NC->state() ) {
        case Unchecked :
        case Unknown :
        case Unavailable :
        case Disabled :
          // this profile does not allow interface to be UP
          // -> try others
          break;
        case Off :
          // try to UP the device
          { QString S= NC->setState( Activate );
            if( ! S.isEmpty() ) {
              // could not bring device Online -> try other alters
              Log(( "disallow %ld for %s : %s\n", 
                  NC->number(), Interface.latin1(), S.latin1() ));
              break;
            }
            // interface assigned 
          }
          // FT
        case Available :
        case IsUp : // also called for 'ifdown'
          // device is ready -> done
          Log(( "allow %ld for %s\n", NC->number(), Interface.latin1()));
          printf( "A%ld%s\n", NC->number(), Interface.latin1() );
          return 0;
      }
    } 
    // if we come here no alternatives are possible
    Log(( "disallow %s\n", Interface.latin1()));
    printf( "D-%s\n", Interface.latin1() );
    return 0;
 }
 bool NetworkSettingsData::isModified( void ) {
    if( ForceModified )
      return 1;
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
         it.current();
         ++it ) {
      if( it.current()->isModified() ) {
        return 1;
      }
    }
    return 0;
 }
 bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) {
    // load situation
-    QList<NodeCollection> PossibleTriggered;
+    QList<NetworkSetup> PossibleTriggered;
    PossibleTriggered = collectTriggered( Interface );
    Log( ( "for %s : Possiblilies %d\n", 
        Interface.latin1(), PossibleTriggered.count() ));
    return ( PossibleTriggered.count() ) ? 1 : 0;
 }
-QList<NodeCollection> NetworkSettingsData::collectTriggered( 
+QList<NetworkSetup> NetworkSettingsData::collectTriggered( 
                      const QString & Interface ) {
-    // collect connections that could be triggered by this interface
+    // collect NetworkSetups that could be triggered by this interface
-    NodeCollection * NC;
+    NetworkSetup * NC;
-    QList<NodeCollection> PossibleTriggered;
+    QList<NetworkSetup> PossibleTriggered;
-    // for all connections
+    // for all NetworkSetups
-    Name2Connection_t & M = NSResources->connections();
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
-    for( QDictIterator<NodeCollection> it(M);
+    for( QDictIterator<NetworkSetup> it(M);
         it.current();
         ++it ) {
      NC = it.current();
      // check if this profile handles the requested interface
      if( NC->triggeredBy( Interface ) && // if different Intf.
          NC->state() != Disabled && // if enabled
          NC->state() != IsUp  // if already used
        ) {
        Log( ( "Append %s for %s\n", 
            NC->name().latin1(), Interface.latin1() ));
        PossibleTriggered.append( NC );
      }
    }
    return PossibleTriggered;
 }
diff --git a/noncore/settings/networksettings2/nsdata.h b/noncore/settings/networksettings2/nsdata.h
index 5791c1e..b9c216d 100644
--- a/noncore/settings/networksettings2/nsdata.h
+++ b/noncore/settings/networksettings2/nsdata.h
@@ -1,38 +1,38 @@
 #ifndef __NSDATA_H
 #define __NSDATA_H
 #include <netnode.h>
 class NetworkSettingsData {
 public :
      NetworkSettingsData( void );
      ~NetworkSettingsData( void );
      void loadSettings( void );
      QString saveSettings( void );
      QString generateSettings( void );
      bool isModified( void );
      inline void setModified( bool M ) 
        { ForceModified = M; }
-      QList<NodeCollection> collectPossible( const QString & Interface );
+      QList<NetworkSetup> collectPossible( const QString & Interface );
      // return TRUE if we need gui to decide
      bool canStart( const QString & Interface );
      // return TRUE if there are vpns that could be triggered
      // by this interface
      bool couldBeTriggered( const QString & Interface );
 private :
-      QList<NodeCollection> collectTriggered( const QString &Interface );
+      QList<NetworkSetup> collectTriggered( const QString &Interface );
      bool ForceModified;
      // collect strings in config file nobody wants
      QStringList LeftOvers;
 };
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
index a7ee662..cfd0491 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTDriver.cpp
@@ -692,53 +692,53 @@ QString OTDriver::getPeerName( const OTDeviceAddress & PAddr ) {
      }
      return QString( name );
 }
 long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
      struct hci_conn_info_req *cr;
      struct hci_request rq;
      read_rssi_rp rp;
      uint16_t handle;
      if( ! open() ) {
        return 0;
      }
      cr = (struct hci_conn_info_req *)malloc(
                sizeof(*cr) + sizeof(struct hci_conn_info));
      if (!cr)
        return 0;
      bacpy( &(cr->bdaddr), &(Addr.getBDAddr()) );
      cr->type = ACL_LINK;
      if (ioctl( fd(), HCIGETCONNINFO, (unsigned long) cr) < 0) {
-        odebug << "Get connection info failed" << oendl;
+        odebug << "Get NetworkSetup info failed" << oendl;
        free(cr);
        return 0;
      }
      handle = htobs(cr->conn_info->handle);
      free(cr);
      memset(&rq, 0, sizeof(rq));
      rq.ogf    = OGF_STATUS_PARAM;
      rq.ocf    = OCF_READ_RSSI;
      rq.cparam = &handle;
      rq.clen   = 2;
      rq.rparam = &rp;
      rq.rlen   = GET_LINK_QUALITY_RP_SIZE;
      if (hci_send_req( fd(), &rq, 100) < 0) {
-         odebug << "Get connection info failed" << oendl;
+         odebug << "Get NetworkSetup info failed" << oendl;
         return 0;
      }
      if( rp.status ) {
        odebug << QString().sprintf("HCI get_link_quality cmd failed (0x%2.2X)", rp.status) << oendl;
        return 0;
      }
      return rp.rssi+50;
 }
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h
index b54ffdf..899fab4 100644
--- a/noncore/settings/networksettings2/opietooth2/OTDriver.h
+++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h
@@ -1,39 +1,39 @@
 /***************************************************************************
 *   Copyright (C) 2003 by Mattia Merzi                                    *
 *   ottobit@ferrara.linux.it                                              *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #ifndef OTDRIVER_H
 #define OTDRIVER_H
 /*
- * This class handles the connection with the BlueZ libraries, implements
+ * This class handles the networkSetup with the BlueZ libraries, implements
 * most of the bluetooth-related functions and owns the KBTDevice class
 * that is a single local bluetooth device representation.
 * It is used as a Singleton pattern thru the getDefaultConnector() method.
 *
 */
 #include <qobject.h>
 #include <opie2/odebug.h>
 #include <bluezlib.h>
 #include <OTDeviceAddress.h>
 namespace Opietooth2 {
 class OTGateway;
 class OTHCISocket;
 class OTDeviceAddress;
 class OTPeer;
 /*
 * This is the representation of a
 * Bluetooth device for the local
 * machine.
 */
 class OTDriver : public QObject {
@@ -97,49 +97,49 @@ public:
         { return IsUp; }
      // get current state 
      // return 1 if UP, 0 if DOWN, -1 if ERROR
      int currentState();
      /*
       * Returns the name of the device. If the device is
       * down, the device id is returned.
       */
      QString name();
      int devId() const 
          { return Dev_id; };
      /*
       * Returns the string representation of the device id,
       * with the same format of the hciconfig tool.
       */
      QString devname() 
          { return Dev; };
      /*
       * Returns the file descriptor for the local
-       * connection to this device
+       * networkSetup to this device
       */
      int fd() const 
          { return Fd; };
      void setfd(int _fd) 
          { Fd = _fd; };
      void setType(int _type) 
         { Type = _type; };
      int type() const 
         { return Type; };
      QString strType();
      int iscan() const 
        { return Iscan; }
      void setIScan(int _iscan) 
        { Iscan = _iscan; }
      int pscan() const 
        { return Pscan; }
      void setPScan(int _pscan) 
        { Pscan = _pscan; }
      int authentication() const 
        { return Auth; }
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
index 1b61a2e..7fc8719 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
@@ -41,51 +41,51 @@ void OTGateway::releaseOTGateway( void ) {
 }
 // open bluetooth system
 OTGateway::OTGateway( void ) : QObject( 0, "OTGateway" ),
                               AllDrivers( this ),
                               AllPeers() {
      ErrorConnectCount = 0;
      TheOTDevice = 0;
      Scanning = 0;
      AllPeersModified = 0;
      AllPeers.setAutoDelete( TRUE );
      if ( ( HciCtl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI)) < 0) {
        SLOT_ShowError( tr( "error opening hci socket" ) );
        return;
      }
      // load all known devices
      updateDrivers();
      // load all peers we have ever seen
      loadKnownPeers();
-      // iterate over drivers and find active connections
+      // iterate over drivers and find active NetworkSetups
      // adding/updating peers
-      loadActiveConnections();
+      loadActiveNetworkSetups();
      // check every 4 seconds the state of BT
      timerEvent(0);
      RefreshTimer = -1;
      setRefreshTimer( 4000 );
      // load known link keys
      readLinkKeys();
 }
 // close bluetooth system
 OTGateway::~OTGateway( void ) {
      if( AllPeersModified ) {
        saveKnownPeers();
      }
      if( Scanning )
        delete Scanning;
      if( TheOTDevice )
        delete TheOTDevice;
      if( HciCtl >= 0 ) {
@@ -354,75 +354,75 @@ void OTGateway::SLOT_FinishedDetecting() {
 const char * OTGateway::deviceTypeToName( int cls ) {
    switch ( (cls & 0x001F00) >> 8) {
      case 0x00:
        return "misc";
      case 0x01:
        return "computer";
      case 0x02:
        return "phone";
      case 0x03:
        return "lan";
      case 0x04:
        return "av";
      case 0x05:
        return "peripheral";
      case 0x06:
        return "imaging";
      case 0x07:
      default :
        break;
    }
    return "unknown";
 }
-PANConnectionVector OTGateway::getPANConnections( void ) {
+PANNetworkSetupVector OTGateway::getPANNetworkSetups( void ) {
-        PANConnectionVector V;
+        PANNetworkSetupVector V;
        struct bnep_connlist_req req;
        struct bnep_conninfo ci[48];
        V.setAutoDelete(TRUE);
        int ctl = socket(PF_BLUETOOTH, SOCK_RAW, BTPROTO_BNEP);
        if (ctl < 0) {
          odebug << "Failed to open control socket" << oendl;
          return V;
        }
        req.cnum = 48;
        req.ci   = ci;
        if (ioctl(ctl, BNEPGETCONNLIST, &req)) {
-          odebug << "Failed to get connection list" << oendl;
+          odebug << "Failed to get NetworkSetup list" << oendl;
          ::close( ctl );
          return V;
        }
        for ( unsigned i=0; i < req.cnum; i++) {
          V.resize( V.size() + 1 );
          if( ci[i].role == BNEP_SVC_PANU ) {
            // we are the client
-            V.insert( V.size()-1, new OTPANConnection(
+            V.insert( V.size()-1, new OTPANNetworkSetup(
                            ci[i].device,
                            batostr((bdaddr_t *) ci[i].dst)
                          ) );
          }
        }
        ::close( ctl );
        return V;
 }
 struct link_key {
        bdaddr_t sba;
        bdaddr_t dba;
        uint8_t  key[16];
        uint8_t  type;
        time_t   time;
 };
 void OTGateway::readLinkKeys( void ) {
        struct link_key k;
        int rv;
        AllKeys.truncate(0);
@@ -489,77 +489,77 @@ bool OTGateway::removeLinkKey( unsigned int Index ) {
        // rename files
        QDir D( "/etc/bluetooth" );
        D.remove( "link_key" );
        D.rename( "newlink_key", "link_key" );
        // restart hcid
        system( "/etc/init.d/hcid stop" );
        system( "/etc/init.d/hcid start" );
        // remove from table
        if( Index < (AllKeys.size()-1) ) {
          // collapse array
          AllKeys[Index] = AllKeys[AllKeys.size()-1];
        }
        // remove last element
        AllKeys.resize( AllKeys.size()-1 );
        return 1;
 }
 #define MAXCONNECTIONS 10
-void OTGateway::loadActiveConnections( void ) {
+void OTGateway::loadActiveNetworkSetups( void ) {
        struct hci_conn_list_req *cl;
        struct hci_conn_info *ci;
        OTDeviceAddress Addr;
        OTPeer * P;
        if (!(cl = (struct hci_conn_list_req *)malloc( 
                      MAXCONNECTIONS * sizeof(*ci) + sizeof(*cl)))) {
          emit error( tr("Can't allocate memory") );
          return;
        }
        memset( cl, 0, MAXCONNECTIONS * sizeof(*ci) + sizeof(*cl) );
        for( unsigned int i = 0;
             i < AllDrivers.count();
             i ++ ) {
          if( ! AllDrivers[i]->isUp() ) {
            continue;
          }
-          // driver is up -> check connections
+          // driver is up -> check NetworkSetups
          cl->dev_id = AllDrivers[i]->devId();
          cl->conn_num = MAXCONNECTIONS;
          ci = cl->conn_info;
          if (ioctl( getSocket(), HCIGETCONNLIST, (void *) cl)) {
-            emit error( tr("Can't get connection list") );
+            emit error( tr("Can't get NetworkSetup list") );
            break;
          }
          for ( int k = 0; k < cl->conn_num; k++, ci++) {
            if( ci->state != BT_CONNECTED ) {
              // not yet connected
              continue;
            }
            Addr.setBDAddr( ci->bdaddr );
            P = findPeer( Addr );
            if( ! P ) {
              // peer not yet known -> add
              P = new OTPeer( this );
              addPeer( P );
              P->setAddress( Addr );
              // infoQueue.push_back(info);
              P->setName( AllDrivers[i]->getPeerName( Addr ) ); 
            } 
            P->setState( OTPeer::Peer_Up );
            P->setConnectedTo( AllDrivers[i] );
          }
        }
@@ -732,43 +732,43 @@ int OTGateway::releaseRFCommDevice( int devnr ) {
      emit error( tr("Can't open RFCOMM control socket") );
      return 0;
    }
    // get all rfcomm devices
    { struct rfcomm_dev_list_req *dl;
      struct rfcomm_dev_info *di, *dr;
      int i;
      dl = (struct rfcomm_dev_list_req *)alloca(
              sizeof(*dl) + RFCOMM_MAX_DEV * sizeof(*di));
      memset( dl, 0, sizeof(*dl) + RFCOMM_MAX_DEV * sizeof(*di) );
      dl->dev_num = RFCOMM_MAX_DEV;
      di = dl->dev_info;
      if( ::ioctl(s, RFCOMMGETDEVLIST, (void *) dl) < 0) {
        emit error( tr("Can't get device list") );
        ::close( s );
        return 0;
      }
      dr = di;
      for (i = 0; i < dl->dev_num; i++, dr++) {
        if( dr->id == devnr ) {
-          // still in connection list 
+          // still in NetworkSetup list 
          struct rfcomm_dev_req req;
          int err;
          memset(&req, 0, sizeof(req));
          req.dev_id = devnr;
          if ((err = ioctl(s, RFCOMMRELEASEDEV, &req)) < 0 ) {
            return err;
          }
          return 0;
        }
      }
    }
    // no device -> nothing to release eiterh
    return 0;
 }
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.h b/noncore/settings/networksettings2/opietooth2/OTGateway.h
index 11c6b30..d0e42db 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.h
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.h
@@ -1,119 +1,119 @@
 #ifndef OTGATEWAY_H
 #define OTGATEWAY_H
 #include <qobject.h>
 #include <qvector.h>
 #include <qmap.h>
 #include <OTDriverList.h>
 #include <OTInquiry.h>
 class QPixmap;
 namespace Opietooth2 {
 class OTDriverList;
 class OTDriver;
 class OTDevice;
 class OTPeer;
 class OTInquiry;
-class OTPANConnection;
+class OTPANNetworkSetup;
 class OTLinkKey;
 typedef QVector<OTPeer> PeerVector;
-typedef QVector<OTPANConnection> PANConnectionVector;
+typedef QVector<OTPANNetworkSetup> PANNetworkSetupVector;
 typedef QArray<OTLinkKey> LinkKeyArray;
 class OTLinkKey {
 public :
    OTLinkKey( const OTDeviceAddress & F,
               const OTDeviceAddress & T ) {
      From = F;
      To = T;
    }
    const OTDeviceAddress & to()
      { return To; }
    const OTDeviceAddress & from()
      { return From; }
    OTDeviceAddress From;
    OTDeviceAddress To;
 };
-class OTPANConnection {
+class OTPANNetworkSetup {
 public :
-    OTPANConnection( const QString & Dev, const QString & CT ) {
+    OTPANNetworkSetup( const QString & Dev, const QString & CT ) {
      Device = Dev;
      ConnectedTo = CT;
    }
    QString Device;
    QString ConnectedTo;
 };
 class OTGateway : public QObject {
      Q_OBJECT
 public :
      // single instance
      static OTGateway * getOTGateway( void );
      static void releaseOTGateway( void );
      // convert device type as class to name for that class
      static const char * deviceTypeToName( int Cls );
      // open bluetooth system
      OTGateway( void );
      // close bluetooth system
      ~OTGateway( void );
      // get access to system device
      OTDevice * getOTDevice();
      // return true if this device needs enabling of bluetooth
      bool needsEnabling();
      // return true if system is running
      bool isEnabled();
      void setRefreshTimer( int MilleSecs );
      // return socket to HCI raw layer
      inline int getSocket()
        { return HciCtl; }
      OTDriverList & getDriverList()
        { return AllDrivers; }
      OTDriver * driver( int nr ) 
        { return AllDrivers.count() == 0 ? 0 : AllDrivers[nr]; }
      void updateDrivers();
-      PANConnectionVector getPANConnections();
+      PANNetworkSetupVector getPANNetworkSetups();
      // scan neighbourhood using device
      void scanNeighbourhood( OTDriver * D = 0 );
      void stopScanOfNeighbourhood(void );
      void setScanWith( OTDriver * D = 0 ) 
        { ScanWith = (D) ? D : 
            (AllDrivers.count() ) ? AllDrivers[0] : 0; }
      OTDriver * scanWith( void )
        { return ScanWith; }
      // get list of all detected peers
      inline const PeerVector & peers( void )
        { return AllPeers; }
      // ping peer to see if it is up
      bool isPeerUp( const OTDeviceAddress & PAddr,
                     int timeoutInSec = 1,
                     int timeoutInUSec = 0,
                     int retry = 1 );
      OTPeer * findPeer( const OTDeviceAddress & Addr );
      void removePeer( OTPeer * P );
      void addPeer( OTPeer * P );
      OTDriver * findDriver( const OTDeviceAddress & Addr );
@@ -152,49 +152,49 @@ signals :
      // signal state of bluetooth driver
      void stateChange( OTDriver * D, bool State );
      // sent when list of drivers changees
      void driverListChanged();
      // sent when bluetooth on device is enabled
      void deviceEnabled( bool );
      
      // sent when a (new if bool = TRUE) peer is detected
      void detectedPeer( OTPeer *, bool );
      // end of detection process
      void finishedDetecting();
 protected :
      void connectNotify( const char * Signal );
      void disconnectNotify( const char * Signal );
      void timerEvent( QTimerEvent * );
 private :
-      void loadActiveConnections( void );
+      void loadActiveNetworkSetups( void );
      void loadKnownPeers( void );
      void saveKnownPeers( void );
      bool isConnectedTo( int devid,
                          const OTDeviceAddress & Address );
      void readLinkKeys();
      static OTGateway * SingleGateway;
      static int UseCount;
      OTDriver *      ScanWith;
      OTDriverList    AllDrivers;
      OTDevice *      TheOTDevice;
      int             HciCtl;
      int             ErrorConnectCount;
      int             RefreshTimer;
      OTInquiry *     Scanning;
      bool            AllPeersModified;
      PeerVector      AllPeers;
      LinkKeyArray    AllKeys;
 };
 }
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h
index f7bdeec..559af7a 100644
--- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h
+++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h
@@ -17,49 +17,49 @@
 #include <qguardedptr.h>
 #include <qtimer.h>
 #include <OTPeer.h>
 // #include <set>
 // #include <deque>
 namespace Opietooth2 {
 class QSocket;
 class QDateTime;
 class OTDriver;
 class OTHCISocket;
 /** Scans for nearby bluetooth devices.
 * This class provides an asynchronous interface to the
 * inquriy HCI command. To scan for other devices, connect
 * to the signals neighbourFound() and finished() and call
 * inquiry(). Inquiry results are signalled as soon as they arrive,
 * so the information can be displayed before the whole inquiry
 * process is finished.
- * Still no connections should be set up before
+ * Still no networkSetups should be set up before
 * the finished() signal was sent (hmm, is this always true..?)
 */
 class OTInquiry : public QObject {
    Q_OBJECT
 public:
    /** Constructor.
    @param owner The owning parent object
    */
    OTInquiry( OTDriver* Drv );
    /** Destructor. */
    virtual ~OTInquiry();
    // General/Unlimited Inquiry Access Code
    static const int GIAC = 0x9E8B33;
    // Limited Dedicated Inquiry Access Code
    static const int LIAC = 0x9E8B00;
    /** Starts the inquiry.
diff --git a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp
index 9264ceb..2b03c73 100644
--- a/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp
+++ b/noncore/settings/networksettings2/ppp/PPPDialingedit.cpp
@@ -1,25 +1,24 @@
 #include <stdio.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qradiobutton.h>
 #include <qlineedit.h>
 #include <GUIUtils.h>
 #include "PPPDialingedit.h"
 PPPDialingEdit::PPPDialingEdit( QWidget * Parent ) : 
                              PPPDialingGUI( Parent ){
      // populate widget stack
 }
 QString PPPDialingEdit::acceptable( void ) {
    return QString();
 }
-bool PPPDialingEdit::commit( PPPData & D ) {
+bool PPPDialingEdit::commit( PPPData & ) {
-    bool SM;
+    return true;
-    return SM;
 }
 void PPPDialingEdit::showData( PPPData & D ) {
 }
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 8c15e9c..884168c 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -1,48 +1,48 @@
 #include <qfile.h>
 #include <resources.h>
 #include <qtextstream.h>
 #include "ppp_NN.h"
 #include "ppp_NNI.h"
 #include "netnodeinterface.h"
 QStringList * PPPNetNode::ProperFiles = 0;
 static const char * PPPNeeds[] = 
    { "modem", 
      0
    };
 static const char * PPPProvides[] = 
-    { "connection", 
+    { "NetworkSetup", 
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
-PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) {
+PPPNetNode::PPPNetNode() : ANetNode(tr("PPP NetworkSetup")) {
      NSResources->addSystemFile( 
        "pap-secrets", "/etc/ppp/pap-secrets", 0 );
      NSResources->addSystemFile( 
        "chap-secrets", "/etc/ppp/chap-secrets", 0 );
 }
 /**
 * Delete any interfaces that we own.
 */
 PPPNetNode::~PPPNetNode(){
 }
 const QString PPPNetNode::nodeDescription(){
      return tr("\
 <p>Sets up IP using PPP.</p>\
 <p>Use this for dialup devices or serial setups</p>\
 "
 );
 }
 ANetNodeInstance * PPPNetNode::createInstance( void ) {
      return new APPP( this );
 }
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
index 9e3bb64..7286d96 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp
@@ -128,108 +128,108 @@ void APPP::saveSpecificAttribute( QTextStream & TS ) {
    TS << "runpredisconnect=" << Data.Run.PreDisconnect << endl;
    TS << "runpostdisconnect=" << Data.Run.PostDisconnect << endl;
 }
 QWidget * APPP::edit( QWidget * parent ) {
    GUI = new PPPEdit( parent );
    GUI->showData( Data );
    return GUI;
 }
 QString APPP::acceptable( void ) {
    return ( GUI ) ? GUI->acceptable( ) : QString();
 }
 void APPP::commit( void ) {
    if( GUI && GUI->commit( Data ) ) {
      setModified( 1 );
    }
 }
 bool APPP::openFile( SystemFile & SF ) {
      if( SF.name() == "peers" ) {
        SF.setPath( removeSpaces( 
-            QString( "/tmp/ppp/peers/" ) + connection()->name() ) );
+            QString( "/tmp/ppp/peers/" ) + networkSetup()->name() ) );
        return 1;
      } else if ( SF.name() == "chatscripts" ) {
        SF.setPath( removeSpaces( 
-            QString( "/tmp/chatscripts/" ) + connection()->name() ) );
+            QString( "/tmp/chatscripts/" ) + networkSetup()->name() ) );
        return 1;
      }
      return 0;
 }
 short APPP::generateFile( SystemFile & SF, long DevNr ) {
    short rvl, rvd;
    rvl = 1;
    rvd = 1;
    if( SF.name() == "pap-secrets" ) {
      Log(("Generate PPP for %s\n", SF.name().latin1() ));
      if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) {
        SF << "# secrets for " 
-           << connection()->name().latin1() 
+           << networkSetup()->name().latin1() 
           << endl;
        SF << Data.Auth.Client 
           << " " 
           << Data.Auth.Server 
           << " " 
           << Data.Auth.Secret
           << endl;
        rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
                SF, DevNr );
      }
    } else if( SF.name() == "chap-secrets" ) {
      Log(("Generate PPP for %s\n", SF.name().latin1() ));
      if( Data.Auth.Mode == 1 && Data.Auth.PCEMode != 0 ) {
        // used for both EAP and Chap
        SF << "# secrets for "
-           << connection()->name().latin1() 
+           << networkSetup()->name().latin1() 
           << endl;
        SF << Data.Auth.Client 
           << " " 
           << Data.Auth.Server 
           << " " 
           << Data.Auth.Secret
           << endl;
        rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
            SF, DevNr );
      }
    } else if ( SF.name() == "peers" ) {
      QFileInfo FI(SF.path());
      Log(("Generate PPP for %s\n", SF.name().latin1() ));
      SF << "connect \"/usr/sbin/chat -v -f /etc/chatscripts/"
         << FI.baseName()
         << "\""
         << endl;
      if( Data.IP.GWIsDefault ) {
        SF << "defaultroute" 
           << endl;
      }
      SF << "linkname "
         << removeSpaces( SF.name().latin1() )
         << endl;
      // insert other data here
      rvl = 0;
-      rvd = connection()->getToplevel()->generateFileEmbedded(
+      rvd = networkSetup()->getToplevel()->generateFileEmbedded(
            SF, DevNr );
    } else if ( SF.name() == "chatscripts" ) {
      Log(("Generate PPP for %s\n", SF.name().latin1() ));
      rvl = 0;
-      rvd = connection()->getToplevel()->generateFileEmbedded(
+      rvd = networkSetup()->getToplevel()->generateFileEmbedded(
            SF, DevNr );
    }
    return (rvd == 2 || rvl == 2 ) ? 2 :
           (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }
diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp
index 8403e6d..f548483 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.cpp
+++ b/noncore/settings/networksettings2/ppp/ppprun.cpp
@@ -1,52 +1,52 @@
 #include <resources.h>
 #include "ppprun.h"
 PPPRun::PPPRun( ANetNodeInstance * NNI, PPPData & Data ) :
          RuntimeInfo( NNI ), Pat( "eth[0-9]" ) { 
      D = &Data; 
 }
 State_t PPPRun::detectState( void ) {
    if( isMyPPPDRunning( ) ) {
      return ( isMyPPPUp() ) ? IsUp : Available;
    } 
    return Off;
 }
-QString PPPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString PPPRun::setMyState( NetworkSetup * , Action_t , bool ) { 
    return QString();
 }
 bool PPPRun::isMyPPPDRunning( void ) {
    return 0;
 }
 bool PPPRun::isMyPPPUp( void ) {
    System & S = NSResources->system();
    InterfaceInfo * Run;
    QRegExp R( "ppp[0-9]" );
    for( QDictIterator<InterfaceInfo> It(S.interfaces());
         It.current();
         ++It ) {
      Run = It.current();
      if( R.match( Run->Name ) >= 0 &&
          Run->IsPointToPoint 
        ) {
        // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
          // assigned to us
          return 1;
        } 
      }
    }
    return 0;
 }
 bool PPPRun::handlesInterface( const QString & S ) {
    return Pat.match( S ) >= 0;
 }
 bool PPPRun::handlesInterface( InterfaceInfo * I ) {
    return handlesInterface( I->Name );
 }
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h
index 2990a96..9535382 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.h
+++ b/noncore/settings/networksettings2/ppp/ppprun.h
@@ -2,36 +2,36 @@
 #define PPPRUN_H
 #include <qregexp.h>
 #include <netnode.h>
 #include "pppdata.h"
 class PPPRun  : public RuntimeInfo {
 public :
      PPPRun( ANetNodeInstance * NNI, 
              PPPData & Data );
      bool handlesInterface( const QString & I );
      bool handlesInterface( InterfaceInfo * );
      State_t detectState( void );
      virtual RuntimeInfo * device( void ) 
        { return this; }
      virtual RuntimeInfo * connection( void ) 
        { return this; }
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      bool isMyPPPDRunning( void );
      bool isMyPPPUp( void );
      PPPData * D;
      QRegExp Pat;
 };
 #endif
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index 1e6912e..007f4a5 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -1,58 +1,58 @@
 #include <resources.h>
 #include "profile_NN.h"
 #include "profile_NNI.h"
 #include "netnodeinterface.h"
 static const char * ProfileNeeds[] = 
-    { "connection", 
+    { "NetworkSetup", 
      0
    };
 static const char * ProfileProvides[] = 
    { "fullsetup", 
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
-ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular connection profile")) {
+ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular NetworkSetup profile")) {
    NSResources->addSystemFile(
      "interfaces", "/etc/network/interfaces", 1 );
 }
 /**
 * Delete any interfaces that we own.
 */
 ProfileNetNode::~ProfileNetNode(){
 }
 const QString ProfileNetNode::nodeDescription(){
      return tr("\
-<p>Define use of an IP connection.</p>\
+<p>Define use of an IP NetworkSetup.</p>\
-<p>Configure if and when this connection needs to be established</p>\
+<p>Configure if and when this NetworkSetup needs to be established</p>\
 "
 );
 }
 ANetNodeInstance * ProfileNetNode::createInstance( void ) {
      return new AProfile( this );
 }
 const char ** ProfileNetNode::needs( void ) {
      return ProfileNeeds;
 }
 const char ** ProfileNetNode::provides( void ) {
      return ProfileProvides;
 }
 void ProfileNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 void ProfileNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 OPIE_NS2_PLUGIN( NetNodeInterface_T<ProfileNetNode> )
diff --git a/noncore/settings/networksettings2/profile/profiledata.h b/noncore/settings/networksettings2/profile/profiledata.h
index c9577e5..2f7060d 100644
--- a/noncore/settings/networksettings2/profile/profiledata.h
+++ b/noncore/settings/networksettings2/profile/profiledata.h
@@ -1,17 +1,17 @@
 #ifndef PROFILE_DATA_H
 #define PROFILE_DATA_H
 #include <qstring.h>
 class ProfileData {
 public :
      QString Description;
      // start up automatically
      bool Automatic;
      // if started up automatically, ask user for confirmation
      bool Confirm;
-      // Do not bring this connection up
+      // Do not bring this networkSetup up
      bool Disabled;
      bool TriggerVPN;
 } ; 
 #endif
diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp
index 88aab15..ad943fe 100644
--- a/noncore/settings/networksettings2/profile/profileedit.cpp
+++ b/noncore/settings/networksettings2/profile/profileedit.cpp
@@ -1,43 +1,47 @@
 #include <qlabel.h>
 #include <qframe.h>
 #include <qcheckbox.h>
 #include <qmultilineedit.h>
 #include <qcheckbox.h>
 #include <GUIUtils.h>
 #include <netnode.h>
 #include <resources.h>
 #include "profileedit.h"
 ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : 
      ProfileGUI( Parent ), RefreshTimer(this) {
      InterfaceInfo * II;
+      II = TNNI->networkSetup()->assignedInterface();
+      Log(( "Interface %p %p %p: %d\n", II, 
+            TNNI, TNNI->networkSetup(), (II) ? II->IsUp : 0 ));
      NNI = TNNI;
      Dev = NNI->runtime()->device();
-      if( ( II = NNI->connection()->assignedInterface() ) ) {
+      if( ( II = NNI->networkSetup()->assignedInterface() ) ) {
        Refresh_CB->setEnabled( TRUE );
        Snd_GB->setEnabled( TRUE );
        Rcv_GB->setEnabled( TRUE );
        Collisions_FRM->setEnabled( TRUE );
        // show current content
        SLOT_Refresh();
        // fill in static data
        InterfaceName_LBL->setText( II->Name );
        IPAddress_LBL->setText( II->Address );
        SubnetMask_LBL->setText( II->Netmask );
        Broadcast_LBL->setText( II->BCastAddress );
        MACAddress_LBL->setText( II->MACAddress );
        if( II->IsPointToPoint ) {
          PointToPoint_LBL->setText( II->DstAddress );
        }
        QString S;
        InterfaceName_LBL->setText( II->Name );
        if( II->HasMulticast ) {
          S += "Multicast";
        }
        if( ! S.isEmpty() ) {
@@ -56,43 +60,43 @@ QString ProfileEdit::acceptable( void ) {
 }
 void ProfileEdit::showData( ProfileData & Data ) {
    Description_LE->setText( Data.Description );
    Automatic_CB->setChecked( Data.Automatic );
    TriggersVPN_CB->setChecked( Data.TriggerVPN );
    Confirm_CB->setChecked( Data.Confirm );
    Disabled_CB->setChecked( Data.Disabled );
 }
 bool ProfileEdit::commit( ProfileData & Data ) {
    bool SM = 0;
    TXTM( Data.Description, Description_LE, SM );
    CBM( Data.Automatic, Automatic_CB, SM );
    CBM( Data.TriggerVPN, TriggersVPN_CB, SM );
    CBM( Data.Disabled, Disabled_CB, SM );
    CBM( Data.Confirm, Confirm_CB, SM );
    return SM;
 }
 void ProfileEdit::SLOT_Refresh( void ) {
-    InterfaceInfo * II = NNI->connection()->assignedInterface();
+    InterfaceInfo * II = NNI->networkSetup()->assignedInterface();
    NSResources->system().refreshStatistics( *II );
    RcvBytes_LBL->setText( II->RcvBytes );
    SndBytes_LBL->setText( II->SndBytes );
    RcvErrors_LBL->setText( II->RcvErrors );
    SndErrors_LBL->setText( II->SndErrors );
    RcvDropped_LBL->setText( II->RcvDropped );
    SndDropped_LBL->setText( II->SndDropped );
    Collisions_LBL->setText( II->Collisions );
 }
 void ProfileEdit::SLOT_AutoRefresh( bool ar ) {
    if( ar ) {
      RefreshTimer.start( 1000 );
      SLOT_Refresh();
    } else {
      RefreshTimer.stop();
    }
 }
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp
index acb67bd..48011ea 100644
--- a/noncore/settings/networksettings2/profile/profilerun.cpp
+++ b/noncore/settings/networksettings2/profile/profilerun.cpp
@@ -1,27 +1,31 @@
 #include <resources.h>
 #include "profilerun.h"
 State_t ProfileRun::detectState( void ) { 
+    InterfaceInfo * II = networkSetup()->assignedInterface();
+    Log(( "Interface %p %p %p: %d\n", II, 
+            netNode(), netNode()->networkSetup(), (II) ? II->IsUp : 0 ));
    if( Data->Disabled ) {
      return Disabled;
    } 
    return Unknown;
 }
-QString ProfileRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString ProfileRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { 
    odebug << "Profile " << Data->Disabled << oendl;
    if( A == Disable ) {
      if( ! Data->Disabled ) {
        Data->Disabled = 1;
        NC->setModified( 1 );
      }
    } else if( A == Enable ) {
      if( Data->Disabled ) { 
        Data->Disabled = 0;
        NC->setModified( 1 );
      }
    }
    return QString();
 }
diff --git a/noncore/settings/networksettings2/profile/profilerun.h b/noncore/settings/networksettings2/profile/profilerun.h
index 2d48b15..9470c0f 100644
--- a/noncore/settings/networksettings2/profile/profilerun.h
+++ b/noncore/settings/networksettings2/profile/profilerun.h
@@ -2,32 +2,32 @@
 #define PROFILERUN_H
 #include <netnode.h>
 #include "profiledata.h"
 class ProfileRun  : public RuntimeInfo {
 public :
      ProfileRun( ANetNodeInstance * NNI, ProfileData & D ) : 
            RuntimeInfo( NNI )
        { Data = &D;  }
      virtual RuntimeInfo * fullSetup( void ) 
        { return this; }
      virtual const QString & description( void )
        { return Data->Description; }
      virtual bool triggersVPN( void ) 
        { return Data->TriggerVPN; }
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      ProfileData * Data;
 };
 #endif
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index 6d90ae0..6e2597c 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -9,49 +9,49 @@ static const char * USBNeeds[] =
    };
 static const char * USBProvides[] = 
    { "device",
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
 USBNetNode::USBNetNode() : ANetNode(tr("USB Cable Connect")) {
    NSResources->addSystemFile(
      "interfaces", "/etc/network/interfaces", 1 );
 }
 /**
 * Delete any interfaces that we own.
 */
 USBNetNode::~USBNetNode(){
 }
 const QString USBNetNode::nodeDescription(){
      return tr("\
 <p>Configure Ethernet over USB.</p>\
-<p>Use this for a computer to computer USB cable connection</p>\
+<p>Use this for a computer to computer USB cable NetworkSetup</p>\
 "
 );
 }
 ANetNodeInstance * USBNetNode::createInstance( void ) {
      return new AUSB( this );
 }
 const char ** USBNetNode::needs( void ) {
      return USBNeeds;
 }
 const char ** USBNetNode::provides( void ) {
      return USBProvides;
 }
 QString USBNetNode::genNic( long ) {
    return QString( "usbf" ); 
 }
 void USBNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 void USBNetNode::saveSpecificAttribute( QTextStream & ) {
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index 763644e..4082f7f 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -1,37 +1,37 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <resources.h>
 #include "usbrun.h"
 State_t USBRun::detectState( void ) {
    // unavailable : no card found
    // available : card found and assigned to us or free
    // up : card found and assigned to us and up
-    NodeCollection * NC = nodeCollection();
+    NetworkSetup * NC = networkSetup();
    QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
    System & Sys = NSResources->system();
    InterfaceInfo * Run;
    QFile F( S );
    Log(("Detecting for %s\n", NC->name().latin1() ));
    if( F.open( IO_ReadOnly ) ) {
      // could open file -> read interface and assign
      QString X;
      QTextStream TS(&F);
      X = TS.readLine();
      Log(("%s exists\n", S.latin1() ));
      // find interface
      if( handlesInterface( X ) ) {
        for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
             It.current();
             ++It ) {
          Run = It.current();
          if( X == Run->Name ) {
            NC->assignInterface( Run );
            return (Run->IsUp) ? IsUp : Available;
          }
        }
      }
@@ -40,81 +40,81 @@ State_t USBRun::detectState( void ) {
    Log(("Assigned %p\n", NC->assignedInterface() ));
    if( ( Run = NC->assignedInterface() ) ) {
      // we already have an interface assigned -> still present ?
      if( ! Run->IsUp ) {
        // usb is still free -> keep assignment
        return Available;
      } // else interface is up but NOT us -> some other profile
    }
    // nothing (valid) assigned to us
    NC->assignInterface( 0 );
    // find possible interface
    if( getInterface() ) {
      // proper type, and Not UP -> free
      // usb cables are currently always available when requested
      // until we can detect if we are plugged in
      return Available;
    }
    return Unavailable;
 }
-QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
+QString USBRun::setMyState( NetworkSetup * NC, Action_t, bool ) {
    InterfaceInfo * I = getInterface();
    if( ! I ) {
      return QString("No usb device available");
    }
    Log(( "Grabbed USB interface %s\n", I->Name.latin1() ));
    // grab this interface
    NC->assignInterface( I );
    return QString();
 }
 // get interface that is free or assigned to us
 InterfaceInfo * USBRun::getInterface( void ) {
    System & S = NSResources->system();
    InterfaceInfo * best = 0, * Run;
    for( QDictIterator<InterfaceInfo> It(S.interfaces());
         It.current();
         ++It ) {
      Run = It.current();
      Log(("%s %d %d=%d %d\n",
          Run->Name.latin1(),
          handlesInterface( Run->Name ),
              Run->CardType, ARPHRD_ETHER,
              ! Run->IsUp ));
      if( handlesInterface( Run->Name ) &&
          Run->CardType == ARPHRD_ETHER
        ) {
        // this is a USB card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
          // assigned to us
          return Run;
        } else if( ! Run->IsUp &&
-                   Run->assignedConnection() == 0 ) {
+                   Run->assignedToNetworkSetup() == 0 ) {
          // free
          best = Run;
        } // UP or not assigned to us
      }
    }
    return best; // can be 0
 }
 bool USBRun::handlesInterface( const QString & S ) {
    return Pat.match( S ) >= 0;
 }
 bool USBRun::handlesInterface( InterfaceInfo * I ) {
    return handlesInterface( I->Name );
 }
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h
index 6ce4fa2..0872f3d 100644
--- a/noncore/settings/networksettings2/usb/usbrun.h
+++ b/noncore/settings/networksettings2/usb/usbrun.h
@@ -4,33 +4,33 @@
 #include <netnode.h>
 #include <qregexp.h>
 #include "usbdata.h"
 class USBRun  : public RuntimeInfo {
 public :
      USBRun( ANetNodeInstance * NNI, 
              USBData & Data ) : 
                RuntimeInfo( NNI ),
                Pat( "usb[0-9abcdef]" ) {
      }
      virtual RuntimeInfo * device( void ) 
        { return this; }
      bool handlesInterface( const QString & I );
      bool handlesInterface( InterfaceInfo * );
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      InterfaceInfo * getInterface( void );
      QRegExp Pat;
 };
 #endif
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index 96e9df2..7c2e77b 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -1,52 +1,52 @@
 #include "vpn_NN.h"
 #include "vpn_NNI.h"
 #include "netnodeinterface.h"
 static const char * VPNNeeds[] = 
    { 0
    };
 static const char * VPNProvides[] = 
-    { "connection",
+    { "NetworkSetup",
      0
    };
 /**
 * Constructor, find all of the possible interfaces
 */
-VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) {
+VPNNetNode::VPNNetNode() : ANetNode(tr("VPN NetworkSetup")) {
 }
 /**
 * Delete any interfaces that we own.
 */
 VPNNetNode::~VPNNetNode(){
 }
 const QString VPNNetNode::nodeDescription(){
      return tr("\
-<p>Configure private IP connection.</p>\
+<p>Configure private IP NetworkSetup.</p>\
 <p>Defines Secure tunnels over non secure IP sessions</p>\
 "
 );
 }
 ANetNodeInstance * VPNNetNode::createInstance( void ) {
      return new AVPN( this );
 }
 const char ** VPNNetNode::needs( void ) {
      return VPNNeeds;
 }
 const char ** VPNNetNode::provides( void ) {
      return VPNProvides;
 }
 void VPNNetNode::setSpecificAttribute( QString & , QString & ) {
 }
 void VPNNetNode::saveSpecificAttribute( QTextStream & ) {
 }
 OPIE_NS2_PLUGIN(  NetNodeInterface_T<VPNNetNode> )
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h
index 9a55625..e40aa87 100644
--- a/noncore/settings/networksettings2/vpn/vpnrun.h
+++ b/noncore/settings/networksettings2/vpn/vpnrun.h
@@ -1,27 +1,27 @@
 #ifndef VPNRUN_H
 #define VPNRUN_H
 #include <netnode.h>
 #include "vpndata.h"
 class VPNRun  : public RuntimeInfo {
 public :
      VPNRun( ANetNodeInstance * NNI, VPNData & Data ) : 
              RuntimeInfo( NNI )
        { }
      virtual RuntimeInfo * connection( void ) 
        { return this; }
      State_t detectState( void )
        { return Unknown; }
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool )
+      QString setMyState( NetworkSetup * , Action_t, bool )
        { return QString(); }
 };
 #endif
diff --git a/noncore/settings/networksettings2/wlan/wlanedit.cpp b/noncore/settings/networksettings2/wlan/wlanedit.cpp
index 74174bf..73c0c7c 100644
--- a/noncore/settings/networksettings2/wlan/wlanedit.cpp
+++ b/noncore/settings/networksettings2/wlan/wlanedit.cpp
@@ -1,47 +1,47 @@
 #include <qlineedit.h>
 #include <qprogressbar.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qregexp.h>
 #include <qcheckbox.h>
 #include <GUIUtils.h>
 #include <resources.h>
 #include <wextensions.h>
 #include "wlanedit.h"
 #include "wlan_NN.h"
 #include "wlan_NNI.h"
 WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) : 
      WLanGUI( Parent ), RefreshTimer(this){
      InterfaceInfo * II;
      NNI = TNNI;
      Dev = NNI->runtime()->device();
      WE = 0;
-      if( ( II = NNI->connection()->assignedInterface() ) ) {
+      if( ( II = NNI->networkSetup()->assignedInterface() ) ) {
        // show data
        WE = new WExtensions( II->Name );
        if( WE->doesHaveWirelessExtensions() ) {
          QString S;
          Station_LBL->setText( WE->station() );
          ESSID_LBL->setText( WE->essid() );
          Mode_LBL->setText( WE->mode() );
          S.setNum( WE->frequency() );
          Frequency_LBL->setText( S );
          S.setNum( WE->channel() );
          Channel_LBL->setText( S );
          S.setNum( WE->rate() );
          Rate_LBL->setText( S );
          AP_LBL->setText( WE->ap() );
          SLOT_Refresh();
          connect( &RefreshTimer, SIGNAL( timeout() ),
                 this, SLOT( SLOT_Refresh() ) );
        }
      }
 }
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.cpp b/noncore/settings/networksettings2/wlan/wlanrun.cpp
index b15a560..a0c5884 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.cpp
+++ b/noncore/settings/networksettings2/wlan/wlanrun.cpp
@@ -1,38 +1,38 @@
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <resources.h>
 #include "wlanrun.h"
 State_t WLanRun::detectState( void ) {
    // unavailable : no card found
    // available : card found and assigned to us or free
    // up : card found and assigned to us and up
-    NodeCollection * NC = nodeCollection();
+    NetworkSetup * NC = networkSetup();
    QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
    System & Sys = NSResources->system();
    InterfaceInfo * Run;
    QFile F( S );
    if( F.open( IO_ReadOnly ) ) {
      // could open file -> read interface and assign
      QString X;
      QTextStream TS(&F);
      X = TS.readLine();
      // find interface
      if( handlesInterface( X ) ) {
        for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
             It.current();
             ++It ) {
          Run = It.current();
          if( X == Run->Name ) {
            NC->assignInterface( Run );
            return (Run->IsUp) ? IsUp : Available;
          }
        }
      }
    } 
@@ -49,72 +49,72 @@ State_t WLanRun::detectState( void ) {
    NC->assignInterface( 0 );
    // find possible interface
    for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
         It.current();
         ++It ) {
      Run = It.current();
      if( handlesInterface( *Run ) &&
          ( Run->CardType == ARPHRD_ETHER
 #ifdef ARPHRD_IEEE1394
            || Run->CardType == ARPHRD_IEEE1394
 #endif
          ) &&
          ! Run->IsUp
        ) {
        // proper type, and Not UP -> free
        return Off;
      }
    }
    return Unavailable;
 }
-QString WLanRun::setMyState( NodeCollection * , Action_t , bool ) {
+QString WLanRun::setMyState( NetworkSetup * , Action_t , bool ) {
    // we only handle activate and deactivate
    return QString();
 }
 // get interface that is free or assigned to us
 InterfaceInfo * WLanRun::getInterface( void ) {
    System & S = NSResources->system();
    InterfaceInfo * best = 0, * Run;
    for( QDictIterator<InterfaceInfo> It(S.interfaces());
         It.current();
         ++It ) {
      Run = It.current();
      if( handlesInterface( *Run ) &&
          ( Run->CardType == ARPHRD_ETHER
 #ifdef ARPHRD_IEEE1394
            || Run->CardType == ARPHRD_IEEE1394
 #endif
          )
        ) {
        // this is a LAN card
-        if( Run->assignedConnection() == netNode()->connection() ) {
+        if( Run->assignedToNetworkSetup() == netNode()->networkSetup() ) {
          // assigned to us
          return Run;
-        } else if( Run->assignedConnection() == 0 ) {
+        } else if( Run->assignedToNetworkSetup() == 0 ) {
          // free
          best = Run;
        }
      }
    }
    return best; // can be 0
 }
 bool WLanRun::handlesInterface( const QString & S ) {
    InterfaceInfo * II;
    II = NSResources->system().interface( S );
    if( ( II = NSResources->system().interface( S ) ) ) {
      return handlesInterface( *II );
    }
    return Pat.match( S ) >= 0;
 }
 bool WLanRun::handlesInterface( const InterfaceInfo & II ) {
    return ( Pat.match( II.Name ) < 0 );
 }
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h
index fd325d4..e3e7735 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.h
+++ b/noncore/settings/networksettings2/wlan/wlanrun.h
@@ -3,34 +3,34 @@
 #include <qregexp.h>
 #include <netnode.h>
 #include "wlandata.h"
 class WLanRun  : public RuntimeInfo {
 public :
      WLanRun( ANetNodeInstance * NNI, WLanData & Data ) : 
               RuntimeInfo( NNI ),
               Pat( "wlan[0-9]" ) {
      }
      virtual RuntimeInfo * device( void ) 
        { return this; }
      bool handlesInterface( const QString & I );
      bool handlesInterface( const InterfaceInfo & II );
      State_t detectState( void );
 protected :
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 private :
      InterfaceInfo * getInterface( void );
      QRegExp Pat;
      WLanData * Data;
 };
 #endif