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
@@ -8,9 +8,9 @@ ActivateProfile::ActivateProfile( const char * Interface ) :
     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() );
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
@@ -14,6 +14,6 @@ public :
 
 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
@@ -6,15 +6,15 @@
 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;
 }
 
@@ -24,10 +24,10 @@ ActivateVPN::ActivateVPN( const QString & I ) :
     QCheckListItem * CI;
     VPN_LV->clear();
     VPN_LV->header()->hide();
 
-    // find all connections that want to be triggered by this interface
-    for( QDictIterator<NodeCollection> it(NSResources->connections());
+    // find all NetworkSetups that want to be triggered by this interface
+    for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
          it.current();
          ++it ) {
       if( it.current()->triggeredBy( I ) ) {
         CI = new MyCheckListItem( it.current(), VPN_LV );
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
@@ -4,10 +4,10 @@
 #include <resources.h>
 #include "bluetoothBNEPrun.h"
 
 using Opietooth2::OTGateway;
-using Opietooth2::OTPANConnection;
-using Opietooth2::PANConnectionVector;
+using Opietooth2::OTPANNetworkSetup;
+using Opietooth2::PANNetworkSetupVector;
 
 BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, 
                   BluetoothBNEPData & D ) : 
                   RuntimeInfo( NNI ),
@@ -27,22 +27,22 @@ 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
-           are available or if that PAN connection is to a device
+        2. if it not connected and we allow any NetworkSetup we
+           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 ) {
@@ -52,17 +52,17 @@ State_t BluetoothBNEPRun::detectState( void ) {
     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");
       }
@@ -88,19 +88,19 @@ bool BluetoothBNEPRun::handlesInterface( const QString & S ) {
 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
-    OTPANConnection * C;
+    // load PAN NetworkSetups
+    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;
@@ -111,16 +111,16 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
       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;
           }
         }
@@ -134,13 +134,13 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
         // 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;
@@ -153,9 +153,9 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) {
     }
 
     if( Candidate ) {
       if ( Grab ) {
-        netNode()->connection()->assignInterface( Candidate );
+        netNode()->networkSetup()->assignInterface( Candidate );
       }
       return 1;
     }
 
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
@@ -21,13 +21,13 @@ public :
       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
@@ -19,9 +19,9 @@ State_t BluetoothRFCOMMRun::detectState( void ) {
       if( ! OT ) {
         OT = OTGateway::getOTGateway();
       }
 
-      if( deviceNrOfConnection() >= 0 ) {
+      if( deviceNrOfNetworkSetup() >= 0 ) {
         return Available;
       }
 
       odebug << "Bluetooth " 
@@ -30,9 +30,9 @@ State_t BluetoothRFCOMMRun::detectState( void ) {
 
       return ( OT->isEnabled() ) ? Off : Unavailable;
 }
 
-QString BluetoothRFCOMMRun::setMyState( NodeCollection *, 
+QString BluetoothRFCOMMRun::setMyState( NetworkSetup *, 
                                       Action_t A, 
                                       bool ) {
 
       if( OT ) {
@@ -69,9 +69,9 @@ QString BluetoothRFCOMMRun::setMyState( NodeCollection *,
 
       if( A == Deactivate ) {
         if( DeviceNr >= 0 ) {
           if( OT->releaseRFCommDevice( DeviceNr ) ) {
-           return QString( "Cannot release RFCOMM connection" );
+           return QString( "Cannot release RFCOMM NetworkSetup" );
           }
           DeviceNr = -1;
         }
       }
@@ -130,17 +130,17 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) {
     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();
     }
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
@@ -19,13 +19,13 @@ public :
       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
@@ -14,9 +14,9 @@ static const char * CableProvides[] =
 
 /**
  * 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.
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
@@ -12,9 +12,9 @@ State_t CableRun::detectState( void ) {
       close( fd );
       return Available;
 }
 
-QString CableRun::setMyState( NodeCollection *, Action_t , bool ) { 
+QString CableRun::setMyState( NetworkSetup *, Action_t , bool ) { 
       return QString();
 }
 
 QString CableRun::deviceFile( void ) {
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
@@ -17,9 +17,9 @@ public :
       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
@@ -84,12 +84,12 @@ void MyQListViewItem::paintCell( QPainter *p, const QColorGroup &cg,
 // REAL GUI
 //
 //
 
-bool EditConnection::AutoCollapse = 1;
+bool EditNetworkSetup::AutoCollapse = 1;
 
-EditConnection::EditConnection( QWidget* parent ) :
-      EditConnectionGUI( parent, 0, TRUE ), TmpCollection() {
+EditNetworkSetup::EditNetworkSetup( QWidget* parent ) :
+      EditNetworkSetupGUI( parent, 0, TRUE ), TmpCollection() {
 
       Tab_TB->setTabEnabled( Setup_FRM, FALSE );
       Setup_FRM->setEnabled( FALSE );
 
@@ -104,9 +104,9 @@ EditConnection::EditConnection( QWidget* parent ) :
       // popluate tree with all NetNodes 
       buildFullTree();
 }
 
-NodeCollection * EditConnection::getTmpCollection( void ) {
+NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
 
       if( TmpIsValid ) 
         // content is stil OK
         return &(TmpCollection);
@@ -118,9 +118,11 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
         if( it.current()->isNew() ) {
           delete it.current();
         }
       }
+
       TmpCollection.clear();
+      TmpCollection.copyFrom( *SelectedNodes );
 
       // update content
       QListViewItem * it = Nodes_LV->firstChild();
       ANetNode * NN;
@@ -192,10 +194,10 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
       TmpIsValid = 1;
       return &(TmpCollection);
 }
 
-// pass a connection NodeCollection to be edited
-void EditConnection::setConnection( NodeCollection * NC ) {
+// pass a NetworkSetup NetworkSetup to be edited
+void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
       ANetNodeInstance * NNI;
       ANetNode * NN;
 
       SelectedNodes = NC;
@@ -242,10 +244,10 @@ void EditConnection::setConnection( NodeCollection * NC ) {
             // this means that this level is NOT present in collection
             // probably INCOMPATIBEL collection OR Missing plugin
             QMessageBox::warning(
                 0, 
-                tr( "Error presentig Connection" ),
-                tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+                tr( "Error presentig NetworkSetup" ),
+                tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                     arg(NNI->nodeClass()->name()) );
             return;
           }
 
@@ -257,16 +259,16 @@ void EditConnection::setConnection( NodeCollection * NC ) {
             // should exist and be the same
             if( NNI ) {
               QMessageBox::warning(
                   0, 
-                  tr( "Error presentig Connection" ),
-                  tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+                  tr( "Error presentig NetworkSetup" ),
+                  tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                       arg(NNI->nodeClass()->name()) );
             } else {
               QMessageBox::warning(
                   0, 
-                  tr( "Error presentig Connection" ),
-                  tr( "<p>Missing connection\"<i>%1</i>\"</p>" ).
+                  tr( "Error presentig NetworkSetup" ),
+                  tr( "<p>Missing NetworkSetup\"<i>%1</i>\"</p>" ).
                       arg(it->text(0)) );
             }
             return;
           }
@@ -275,13 +277,13 @@ void EditConnection::setConnection( NodeCollection * NC ) {
       }
 }
 
 // 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();
@@ -304,9 +306,9 @@ NodeCollection * EditConnection::connection( void ) {
       return SelectedNodes;
 }
 
 // Build device tree -> start 
-void EditConnection::buildFullTree( void ) {
+void EditNetworkSetup::buildFullTree( void ) {
     ANetNode * NN;
 
     // toplevel item
     MyQCheckListItem * TheTop = new MyQCheckListItem( 
@@ -318,9 +320,9 @@ void EditConnection::buildFullTree( void ) {
           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();
@@ -341,9 +343,9 @@ void EditConnection::buildFullTree( void ) {
     }
 }
 
 // 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
@@ -377,13 +379,13 @@ void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) {
     }
 }
 
 // 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;
     }
 
@@ -417,14 +419,14 @@ void EditConnection::accept( void ) {
     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" ) );
@@ -464,9 +466,9 @@ void EditConnection::SLOT_SelectNode( QListViewItem * it ) {
     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
 
@@ -513,9 +515,9 @@ void EditConnection::SLOT_AlterTab( const QString & S ) {
     }
 }
 
 // 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 );
@@ -539,9 +541,9 @@ void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
                     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 )
@@ -551,9 +553,9 @@ void EditConnection::disableTree( QListViewItem * it, bool Mode ) {
     }
 }
 
 // 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 ) {
@@ -588,9 +590,9 @@ void EditConnection::enablePath( QListViewItem * it, bool pha ) {
     }
 }
 
 // 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;
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
@@ -9,19 +9,19 @@ 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 );
-      NodeCollection * connection( void );
+      void setNetworkSetup( NetworkSetup * NC );
+      NetworkSetup * networkSetup( void );
 
 public slots :
 
       void SLOT_AutoCollapse( bool );
@@ -30,20 +30,20 @@ public slots :
       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,11 +1,11 @@
 <!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>
@@ -116,9 +116,9 @@
                                     <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>
@@ -377,15 +377,15 @@
 <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>
@@ -395,9 +395,9 @@
     </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>
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
@@ -11,9 +11,9 @@ static const char * GPRSNeeds[] =
       0
     };
 
 static const char * GPRSProvides[] = 
-    { "connection", 
+    { "NetworkSetup", 
       0
     };
 
 /**
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
@@ -121,9 +121,9 @@ short AGPRSDevice::generateFile( SystemFile & SF,
     } 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;
@@ -134,9 +134,9 @@ short AGPRSDevice::generateFile( SystemFile & SF,
         }
       }
       if( Data.Debug ) {
         SF << "logfile /tmp/" 
-           << removeSpaces( connection()->name() ) 
+           << removeSpaces( networkSetup()->name() ) 
            << oendl;
         for( int i = 0; i < Data.Debug; i ++ ) {
           SF << "debug" << oendl;
         }
@@ -145,11 +145,11 @@ short AGPRSDevice::generateFile( SystemFile & SF,
       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;
@@ -191,17 +191,17 @@ short AGPRSDevice::generateFile( SystemFile & SF,
       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;
@@ -210,21 +210,21 @@ short AGPRSDevice::generateFile( SystemFile & SF,
 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
@@ -10,9 +10,9 @@
 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");
 
@@ -61,9 +61,9 @@ State_t GPRSRun::detectState( void ) {
       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;
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
@@ -23,9 +23,9 @@ public :
       State_t detectState( void );
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :
 
       QRegExp Pat;
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
@@ -19,7 +19,7 @@ public :
         { 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
@@ -9,9 +9,9 @@ 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;
@@ -69,9 +69,9 @@ State_t LanCardRun::detectState( void ) {
 
     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();
 
@@ -113,12 +113,12 @@ InterfaceInfo * LanCardRun::getInterface( void ) {
 #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;
         }
       }
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
@@ -24,9 +24,9 @@ public :
       State_t detectState( void );
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :
 
       InterfaceInfo * getInterface( void );
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
@@ -19,7 +19,7 @@ public :
         { 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
@@ -11,9 +11,9 @@ static const char * NetworkNeeds[] =
       0
     };
 
 static const char * NetworkProvides[] = 
-    { "connection",
+    { "NetworkSetup",
       0
     };
 
 /**
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
@@ -116,16 +116,16 @@ short ANetwork::generateFile( SystemFile &SF,
       // 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 "
@@ -133,26 +133,26 @@ short ANetwork::generateFile( SystemFile &SF,
              << 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 
@@ -210,9 +210,9 @@ short ANetwork::generateFile( SystemFile &SF,
       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
@@ -3,23 +3,22 @@
 #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 ) {
@@ -39,9 +38,9 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
     }
 
     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(" "));
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
@@ -15,6 +15,6 @@ public :
       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
@@ -63,12 +63,12 @@ NetworkSettings::NetworkSettings( QWidget *parent,
     connect( Profiles_LB, 
              SIGNAL(rightButtonPressed(QListBoxItem*,const QPoint&)),
              this, SLOT(SLOT_EditNode(QListBoxItem*)) );
 
-    { Name2Connection_t & M = NSResources->connections();
-      NodeCollection * NC;
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
+    { Name2NetworkSetup_t & M = NSResources->networkSetups();
+      NetworkSetup * NC;
+      // for all NetworkSetups
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
            ++it ) {
         NC = it.current();
         Profiles_LB->insertItem( NC->devicePixmap(),
@@ -80,9 +80,9 @@ NetworkSettings::NetworkSettings( QWidget *parent,
       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()), 
@@ -135,12 +135,12 @@ void NetworkSettings::SLOT_CmdMessage( const QString & S ) {
 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 ) {
@@ -151,12 +151,12 @@ void NetworkSettings::SLOT_RefreshStates( void ) {
 
 
     /* -> 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 ) {
@@ -189,26 +189,26 @@ void NetworkSettings::SLOT_DeleteNode( void ) {
           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 
@@ -217,14 +217,14 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
     // 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, 
@@ -233,10 +233,10 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
                 );
                 continue; // restart exec
               } // else new name
               // new name -> remove item
-              NSResources->removeConnection( OldName );
-              NSResources->addConnection( NC, 0 );
+              NSResources->removeNetworkSetup( OldName );
+              NSResources->addNetworkSetup( NC, 0 );
             } // else not changed
 
             // must add it here since change will trigger event
             Profiles_LB->changeItem( NC->devicePixmap(),
@@ -245,19 +245,19 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
                                    );
           } else {
             // new item
             int ci = Profiles_LB->count();
-            NSResources->addConnection( NC, 0 );
-            NC->setNumber( NSResources->assignConnectionNumber() );
+            NSResources->addNetworkSetup( NC, 0 );
+            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;
@@ -269,9 +269,9 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
 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 {
@@ -352,9 +352,9 @@ void NetworkSettings::SLOT_Disable( bool T ) {
 
     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() ) {
@@ -381,10 +381,10 @@ void NetworkSettings::SLOT_Up( void ) {
 
     if ( ! LBI ) 
       return;
 
-    NodeCollection * NC = 
-        NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = 
+        NSResources->findNetworkSetup( LBI->text() );
 
     switch( NC->state() ) {
       case Disabled : // cannot modify this state
       case Unknown : // cannot modify this state
@@ -437,10 +437,10 @@ void NetworkSettings::SLOT_Down( void ) {
 
     if ( ! LBI ) 
       return;
 
-    NodeCollection * NC = 
-        NSResources->findConnection( LBI->text() );
+    NetworkSetup * NC = 
+        NSResources->findNetworkSetup( LBI->text() );
 
     switch( NC->state() ) {
       case Disabled : // cannot modify this state
       case Unknown : // cannot modify this state
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
@@ -3,14 +3,14 @@
 
 #include <resources.h>
 
 // pure virtual (component oriented) interface of any
-// plugin that offers a connection
-class AsConnection : public RuntimeInfo {
+// plugin that offers a networkSetup
+class AsNetworkSetup : public RuntimeInfo {
 
 public :
 
-    AsConnection( ANetNodeInstance * NNI ) :
+    AsNetworkSetup( ANetNodeInstance * NNI ) :
         RuntimeInfo( NNI ) { 
     }
 
 };
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
@@ -124,18 +124,18 @@ void ANetNodeInstance::saveAttributes( QTextStream & TS ) {
     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;
@@ -144,9 +144,9 @@ NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() {
     Number = -1;
     Done = 0;
 }
 
-NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
+NetworkSetup::NetworkSetup( QTextStream & TS, bool & Dangling ) :
       QList<ANetNodeInstance>() {
     long idx;
     QString S, A, N;
 
@@ -186,9 +186,9 @@ NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
         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;
@@ -199,22 +199,22 @@ NodeCollection::NodeCollection( QTextStream & TS, bool & Dangling ) :
     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 ) {
-    NNI->setConnection( this );
+void NetworkSetup::append( ANetNodeInstance * NNI ) {
+    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;
@@ -227,9 +227,9 @@ void NodeCollection::save( QTextStream & TS ) {
     TS << endl;
     IsNew = 0;
 }
 
-ANetNodeInstance * NodeCollection::getToplevel( void ) {
+ANetNodeInstance * NetworkSetup::getToplevel( void ) {
     ANetNodeInstance * NNI = 0;
     for( QListIterator<ANetNodeInstance> it(*this); 
          it.current();
          ++it ) {
@@ -240,9 +240,9 @@ ANetNodeInstance * NodeCollection::getToplevel( void ) {
     }
     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 ) {
@@ -253,9 +253,9 @@ ANetNodeInstance * NodeCollection::findByName( const QString & S ) {
     }
     return 0;
 }
 
-ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) {
+ANetNodeInstance * NetworkSetup::findNext( ANetNodeInstance * NNI ) {
     ANetNodeInstance * NNNI;
 
     if( ! NNI )
       getToplevel();
@@ -271,9 +271,9 @@ ANetNodeInstance * NodeCollection::findNext( ANetNodeInstance * NNI ) {
     }
     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;
@@ -289,9 +289,9 @@ static char * State2PixmapTbl[] = {
     "disconnected", // available 
     "connected" // up 
 };
 
-QPixmap NodeCollection::devicePixmap( void ) {
+QPixmap NetworkSetup::devicePixmap( void ) {
     QPixmap pm = NSResources->getPixmap(
             getToplevel()->nextNode()->pixmapName()+"-large");
 
     QPixmap Mini = NSResources->getPixmap( 
@@ -307,13 +307,13 @@ QPixmap NodeCollection::devicePixmap( void ) {
     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 :
@@ -332,25 +332,25 @@ QString NodeCollection::stateName( State_t S) {
     }
     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 ) ) {
@@ -359,16 +359,16 @@ ANetNodeInstance * NodeCollection::firstWithDataForFile( SystemFile & S ) {
     }
     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); 
@@ -394,9 +394,9 @@ State_t NodeCollection::state( bool Update ) {
 
     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;
@@ -491,15 +491,24 @@ QString NodeCollection::setState( Action_t A, bool Force ) {
     }
     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();
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
@@ -14,17 +14,17 @@
 
 // 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;
@@ -38,22 +38,22 @@ 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 {
@@ -64,11 +64,11 @@ typedef enum Action {
     // 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 {
@@ -90,9 +90,9 @@ public:
       { 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 ) ;
@@ -244,12 +244,12 @@ public:
 
     inline const char ** needs( void )
       { return NodeType->needs(); }
 
-    inline void setConnection( NodeCollection * NC ) 
-      { Connection = NC; }
-    inline NodeCollection * connection( void ) 
-      { return Connection; }
+    inline void setNetworkSetup( NetworkSetup * NC ) 
+      { TheNetworkSetup = NC; }
+    inline NetworkSetup * networkSetup( void ) 
+      { return TheNetworkSetup; }
 
     //
     //
     // Virtual methods with sensible defaults
@@ -314,10 +314,10 @@ protected :
     virtual void setSpecificAttribute( QString & , QString & ) = 0;
     virtual void saveSpecificAttribute( QTextStream & ) = 0;
 
     ANetNode * NodeType;
-    // connection to which this node belongs to
-    NodeCollection * Connection;
+    // networkSetup to which this node belongs to
+    NetworkSetup * TheNetworkSetup;
     QString   Description;
     bool      IsModified;
     // true if this nodeinstance was just created (and not
     // loaded from file
@@ -377,9 +377,9 @@ public :
         { NNI = TheNNI; }
 
       //
       //
-      // methods to be overloaded by connection capable
+      // methods to be overloaded by networkSetup capable
       // runtimes
       //
       //
 
@@ -474,14 +474,14 @@ public :
 
       inline ANetNodeInstance * netNode() 
         { return NNI; }
 
-      inline NodeCollection * nodeCollection() 
-        { return NNI->connection(); }
+      inline NetworkSetup * networkSetup() 
+        { 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 ) {
@@ -496,23 +496,26 @@ signals :
 
 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 );
-      NodeCollection( QTextStream & TS, bool & Dangling );
-      ~NodeCollection( void );
+      NetworkSetup( void );
+      NetworkSetup( QTextStream & TS, bool & Dangling );
+      ~NetworkSetup( void );
+
+      // copy settings from NC to this 
+      void copyFrom( const NetworkSetup & NC );
 
       inline int done( void ) 
         { return Done; }
       inline void setDone( int D ) 
@@ -542,17 +545,17 @@ public :
       }
 
       // assign the interface to this device
       inline void assignInterface( InterfaceInfo * NI ) {
-        if( NI == 0 ) {
-          if( AssignedInterface ) {
-            AssignedInterface->assignConnection( 0 );
-          }
-        }
-        AssignedInterface = NI;
+        // cleanup previous
         if( AssignedInterface ) {
-          AssignedInterface->assignConnection( this );
+          AssignedInterface->assignToNetworkSetup( 0 );
         }
+        if( NI ) {
+          // assign new
+          NI->assignToNetworkSetup( this );
+        }
+        AssignedInterface = NI;
       }
 
       inline RuntimeInfo * device() {
         return getToplevel()->runtime()->device();
@@ -576,9 +579,9 @@ public :
       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 );
@@ -618,9 +621,9 @@ private :
                          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
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
@@ -24,9 +24,9 @@
 // single resources instance
 TheNSResources * _NSResources = 0;
 
 TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
-        ConnectionsMap(), DanglingConnectionsMap() {
+        NetworkSetupsMap(), DanglingNetworkSetupsMap() {
 
     _NSResources = this;
 
     detectCurrentUser();
@@ -79,14 +79,14 @@ TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
     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" ),
-         tr( "<p>Nodes that provide working IP connections</p>" ) );
-    addNodeType( "fullsetup", tr( "Connection Profile" ),
-         tr( "<p>Fully configured connection profile</p>" ) );
-    addNodeType( "GPRS", tr( "Connection to GPRS device" ),
-         tr( "<p>Connection to a GPRS capable device</p>" ) );
+    addNodeType( "NetworkSetup", tr( "IP NetworkSetup" ),
+         tr( "<p>Nodes that provide working IP NetworkSetups</p>" ) );
+    addNodeType( "fullsetup", tr( "NetworkSetup Profile" ),
+         tr( "<p>Fully configured NetworkSetup profile</p>" ) );
+    addNodeType( "GPRS", tr( "NetworkSetup to GPRS device" ),
+         tr( "<p>NetworkSetup to a GPRS capable device</p>" ) );
 
     // get access to the system
     TheSystem = new System();
 
@@ -200,14 +200,14 @@ void TheNSResources::findAvailableNetNodes( void ){
     }
 
 }
 
-// used to find unique connection number
-int TheNSResources::assignConnectionNumber( void ) {
+// used to find unique NetworkSetup number
+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;
@@ -244,16 +244,16 @@ const QString & TheNSResources::netNode2Name( const char * 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);
@@ -266,33 +266,33 @@ void TheNSResources::addConnection( NodeCollection * NC, bool Dangling ) {
         }
       }
 }
 
-void TheNSResources::removeConnection( const QString & N ) {
-      NodeCollection * NC = findConnection( N );
+void TheNSResources::removeNetworkSetup( const QString & 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 ) ) {
-        ConnectionsMap.remove( N ); 
+      if( NetworkSetupsMap.find( N ) ) {
+        NetworkSetupsMap.remove( N ); 
       } else {
-        DanglingConnectionsMap.remove( N ); 
+        DanglingNetworkSetupsMap.remove( N ); 
       }
 
 }
 
-// dangling connections are filtered out
-NodeCollection * TheNSResources::findConnection( const QString & S ) {
-      return ConnectionsMap[ S ];
+// dangling NetworkSetups are filtered out
+NetworkSetup * TheNSResources::findNetworkSetup( const QString & S ) {
+      return NetworkSetupsMap[ S ];
 }
 
-NodeCollection *  TheNSResources::getConnection( int nr ) {
-      for( QDictIterator<NodeCollection> it(ConnectionsMap);
+NetworkSetup *  TheNSResources::getNetworkSetup( int nr ) {
+      for( QDictIterator<NetworkSetup> it(NetworkSetupsMap);
            it.current();
            ++it ) {
         if( it.current()->number() == nr ) {
           return it.current();
@@ -300,19 +300,19 @@ NodeCollection *  TheNSResources::getConnection( int nr ) {
       }
       return 0;
 }
 /*
-void TheNSResources::renumberConnections( void ) {
-      Name2Connection_t & M = NSResources->connections();
-      NodeCollection * NC;
+void TheNSResources::renumberNetworkSetups( void ) {
+      Name2NetworkSetup_t & M = NSResources->NetworkSetups();
+      NetworkSetup * NC;
 
-      // for all connections
-      NodeCollection::resetMaxNr();
-      for( QDictIterator<NodeCollection> it(M);
+      // for all NetworkSetups
+      NetworkSetup::resetMaxNr();
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
            ++it ) {
         NC = it.current();
-        NC->setNumber( NC->maxConnectionNumber()+1 );
+        NC->setNumber( NC->maxNetworkSetupNumber()+1 );
         NC->setModified( 1 );
       }
 }
 */
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
@@ -39,9 +39,9 @@ public :
 };
 
 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 {
 
@@ -55,9 +55,9 @@ public :
 
     System & system()
       { return *TheSystem; }
 
-    int assignConnectionNumber(void);
+    int assignNetworkSetupNumber(void);
     QPixmap getPixmap( const QString & Name );
 
     Name2NetNode_t & netNodes( void ) 
       { return AllNodeTypes; }
@@ -102,16 +102,16 @@ public :
 
     const QString & netNode2Name( const char * Type );
     const QString & netNode2Description( const char * Type );
 
-    void addConnection( NodeCollection * NC, bool Dangling );
-    void removeConnection( const QString & N );
-    NodeCollection * findConnection( const QString & N );
-    NodeCollection * getConnection( int nr );
-    Name2Connection_t & connections( void )
-      { return ConnectionsMap; }
-    Name2Connection_t & danglingConnections( void )
-      { return DanglingConnectionsMap; }
+    void addNetworkSetup( NetworkSetup * NC, bool Dangling );
+    void removeNetworkSetup( const QString & N );
+    NetworkSetup * findNetworkSetup( const QString & N );
+    NetworkSetup * getNetworkSetup( int nr );
+    Name2NetworkSetup_t & networkSetups( void )
+      { return NetworkSetupsMap; }
+    Name2NetworkSetup_t & danglingNetworkSetups( void )
+      { return DanglingNetworkSetupsMap; }
 
     inline bool userKnown( void )
       { return CurrentUser.known(); }
     CurrentQPEUser & currentUser( void )
@@ -125,13 +125,13 @@ private :
     void findAvailableNetNodes( void );
 
     QMap< QString, QString>   NodeTypeNameMap;
     QMap< QString, QString>   NodeTypeDescriptionMap;
-    // list of connections that are valid
-    Name2Connection_t         ConnectionsMap;
-    // list of connection configurations that are not valid
+    // list of networkSetups that are valid
+    Name2NetworkSetup_t         NetworkSetupsMap;
+    // 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 
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
@@ -452,15 +452,15 @@ void System::probeInterfaces( void ) {
 }
 
 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;
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
@@ -12,9 +12,9 @@ using namespace Opie::Core;
 #include <qdict.h>
 #include <qobject.h>
 #include <stdio.h>
 
-class NodeCollection;
+class NetworkSetup;
 class ANetNodeInstance;
 class QFile;
 
 class MyProcess : public QObject {
@@ -65,15 +65,15 @@ public :
             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
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
@@ -49,16 +49,16 @@ NetworkSettingsData::NetworkSettingsData( void ) {
         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", 
@@ -98,9 +98,9 @@ void NetworkSettingsData::loadSettings( void ) {
 
            [NETNODETYPE] 
            Entries ...
            <EMPTYLINE>
-           [connection] 
+           [NetworkSetup] 
            Name=Name
            Node=Name
            <EMPTYLINE>
       */
@@ -115,13 +115,13 @@ void NetworkSettingsData::loadSettings( void ) {
         if( ! NSResources ) {
           continue;
         }
 
-        if( S == "connection" ) {
-          // load connections -> collections of nodes
+        if( S == "NetworkSetup" ) {
+          // load NetworkSetups -> collections of nodes
           bool Dangling;
-          NodeCollection * NC = new NodeCollection( TS, Dangling );
-          NSResources->addConnection( NC, Dangling );
+          NetworkSetup * NC = new NetworkSetup( TS, Dangling );
+          NSResources->addNetworkSetup( NC, Dangling );
         } else {
           ANetNode * NN = 0;
           ANetNodeInstance* NNI = 0;
           if( S.startsWith( "nodetype " ) ) {
@@ -250,28 +250,28 @@ QString NetworkSettingsData::saveSettings( void ) {
         TS << endl;
       }
     }
 
-    // good connections
-    { Name2Connection_t & M = NSResources->connections();
+    // good NetworkSetups
+    { Name2NetworkSetup_t & M = NSResources->networkSetups();
 
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
+      // for all NetworkSetups
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
            ++it ) {
-        TS << "[connection]" << endl;
+        TS << "[NetworkSetup]" << endl;
         it.current()->save(TS);
       }
     }
 
-    // save dangling connections
-    { Name2Connection_t & M = NSResources->danglingConnections();
+    // save dangling NetworkSetups
+    { Name2NetworkSetup_t & M = NSResources->danglingNetworkSetups();
 
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
+      // for all NetworkSetups
+      for( QDictIterator<NetworkSetup> it(M);
            it.current();
            ++it ) {
-        TS << "[connection]" << endl;
+        TS << "[NetworkSetup]" << endl;
         it.current()->save(TS);
       }
     }
 
@@ -282,9 +282,9 @@ QString NetworkSettingsData::saveSettings( void ) {
     // 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 );
     }
@@ -294,10 +294,10 @@ QString NetworkSettingsData::saveSettings( void ) {
 
 QString NetworkSettingsData::generateSettings( void ) {
     QString S = "";
     Name2SystemFile_t & SFM = NSResources->systemFiles();
-    Name2Connection_t & M = NSResources->connections();
-    NodeCollection * NC;
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
+    NetworkSetup * NC;
     ANetNodeInstance * NNI;
     ANetNodeInstance * FirstWithData;
     RuntimeInfo * CurDev;
     ANetNode * NN, * CurDevNN = 0;
@@ -427,9 +427,9 @@ QString NetworkSettingsData::generateSettings( void ) {
            ++nniit ) {
         nniit.current()->setDone(0);
       }
 
-      for( QDictIterator<NodeCollection> ncit(M);
+      for( QDictIterator<NetworkSetup> ncit(M);
            ncit.current();
            ++ncit ) {
         ncit.current()->setDone(0);
       }
@@ -487,10 +487,10 @@ QString NetworkSettingsData::generateSettings( void ) {
             arg( SF->name() );
         return S;
       }
 
-      // find connections that want to write to this file
-      for( QDictIterator<NodeCollection> ncit(M);
+      // find NetworkSetups that want to write to this file
+      for( QDictIterator<NetworkSetup> ncit(M);
            ncit.current();
            ++ncit ) {
 
         NC = ncit.current();
@@ -504,14 +504,14 @@ QString NetworkSettingsData::generateSettings( void ) {
           // 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();
 
@@ -570,19 +570,19 @@ QString NetworkSettingsData::generateSettings( void ) {
             ));
         }
 
         // generate profile specific info
-        // for all nodeconnections that work on the same device
-        for( QDictIterator<NodeCollection> ncit2(M);
+        // for all nodeNetworkSetups that work on the same device
+        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 );
@@ -644,17 +644,17 @@ QString NetworkSettingsData::generateSettings( void ) {
     }
     return S;
 }
 
-QList<NodeCollection> NetworkSettingsData::collectPossible( 
+QList<NetworkSetup> NetworkSettingsData::collectPossible( 
                     const QString & Interface ) {
-    // collect connections that can work on top of this interface
-    NodeCollection * NC;
-    QList<NodeCollection> PossibleConnections;
-    Name2Connection_t & M = NSResources->connections();
+    // collect NetworkSetups that can work on top of this interface
+    NetworkSetup * NC;
+    QList<NetworkSetup> PossibleNetworkSetups;
+    Name2NetworkSetup_t & M = NSResources->networkSetups();
 
-    // for all connections
-    for( QDictIterator<NodeCollection> it(M);
+    // for all NetworkSetups
+    for( QDictIterator<NetworkSetup> it(M);
          it.current();
          ++it ) {
       NC = it.current();
       // check if this profile handles the requested interface
@@ -663,12 +663,12 @@ QList<NodeCollection> NetworkSettingsData::collectPossible(
           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;
 }
 
 
 /*
@@ -678,20 +678,20 @@ QList<NodeCollection> NetworkSettingsData::collectPossible(
 */
 
 bool NetworkSettingsData::canStart( const QString & Interface ) {
     // load situation
-    NodeCollection * NC = 0;
-    QList<NodeCollection> PossibleConnections;
+    NetworkSetup * NC = 0;
+    QList<NetworkSetup> PossibleNetworkSetups;
 
-    PossibleConnections = collectPossible( Interface );
+    PossibleNetworkSetups = collectPossible( Interface );
 
     Log( ( "for %s : Possiblilies %d\n", 
-        Interface.latin1(), PossibleConnections.count() ));
-    switch( PossibleConnections.count() ) {
-      case 0 : // no connections
+        Interface.latin1(), PossibleNetworkSetups.count() ));
+    switch( PossibleNetworkSetups.count() ) {
+      case 0 : // no NetworkSetups
         break;
-      case 1 : // one connection
-        NC = PossibleConnections.first();
+      case 1 : // one NetworkSetup
+        NC = PossibleNetworkSetups.first();
         break;
       default : // need to ask user ?
         return 1;
     }
@@ -735,9 +735,9 @@ bool NetworkSettingsData::canStart( const QString & Interface ) {
 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;
@@ -747,9 +747,9 @@ bool NetworkSettingsData::isModified( void ) {
 }
 
 bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) {
     // load situation
-    QList<NodeCollection> PossibleTriggered;
+    QList<NetworkSetup> PossibleTriggered;
 
     PossibleTriggered = collectTriggered( Interface );
 
     Log( ( "for %s : Possiblilies %d\n", 
@@ -757,19 +757,19 @@ bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) {
 
     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
-    NodeCollection * NC;
-    QList<NodeCollection> PossibleTriggered;
+    // collect NetworkSetups that could be triggered by this interface
+    NetworkSetup * NC;
+    QList<NetworkSetup> PossibleTriggered;
 
-    // for all connections
-    Name2Connection_t & M = NSResources->connections();
+    // for all NetworkSetups
+    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
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
@@ -18,18 +18,18 @@ public :
       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;
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
@@ -712,9 +712,9 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
       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;
       }
 
@@ -730,9 +730,9 @@ long OTDriver::getLinkQuality( const OTDeviceAddress & Addr ) {
       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 ) {
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
@@ -11,9 +11,9 @@
 #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.
  *
@@ -117,9 +117,9 @@ public:
           { 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) 
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
@@ -61,11 +61,11 @@ OTGateway::OTGateway( void ) : QObject( 0, "OTGateway" ),
 
       // 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;
@@ -374,10 +374,10 @@ const char * OTGateway::deviceTypeToName( int cls ) {
     }
     return "unknown";
 }
 
-PANConnectionVector OTGateway::getPANConnections( void ) {
-        PANConnectionVector V;
+PANNetworkSetupVector OTGateway::getPANNetworkSetups( void ) {
+        PANNetworkSetupVector V;
 
         struct bnep_connlist_req req;
         struct bnep_conninfo ci[48];
 
@@ -391,18 +391,18 @@ PANConnectionVector OTGateway::getPANConnections( void ) {
 
         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)
                           ) );
           }
@@ -509,9 +509,9 @@ bool OTGateway::removeLinkKey( unsigned int Index ) {
         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;
@@ -531,15 +531,15 @@ void OTGateway::loadActiveConnections( void ) {
           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++) {
@@ -752,9 +752,9 @@ int OTGateway::releaseRFCommDevice( int devnr ) {
 
       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));
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
@@ -16,13 +16,13 @@ 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 {
 
@@ -42,13 +42,13 @@ public :
     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;
     }
 
@@ -91,9 +91,9 @@ public :
       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 );
@@ -172,9 +172,9 @@ protected :
       void timerEvent( QTimerEvent * );
 
 private :
 
-      void loadActiveConnections( void );
+      void loadActiveNetworkSetups( void );
       void loadKnownPeers( void );
       void saveKnownPeers( void );
       bool isConnectedTo( int devid,
                           const OTDeviceAddress & Address );
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
@@ -37,9 +37,9 @@ class OTHCISocket;
  * 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 {
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
@@ -15,11 +15,10 @@ PPPDialingEdit::PPPDialingEdit( QWidget * Parent ) :
 QString PPPDialingEdit::acceptable( void ) {
     return QString();
 }
 
-bool PPPDialingEdit::commit( PPPData & D ) {
-    bool SM;
-    return SM;
+bool PPPDialingEdit::commit( PPPData & ) {
+    return true;
 }
 
 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
@@ -13,16 +13,16 @@ static const char * PPPNeeds[] =
       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( 
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
@@ -148,13 +148,13 @@ void APPP::commit( void ) {
 
 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;
 }
@@ -169,26 +169,26 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
       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 
@@ -196,9 +196,9 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
            << Data.Auth.Secret
            << endl;
 
         rvl = 0;
-        rvd = connection()->getToplevel()->generateFileEmbedded( 
+        rvd = networkSetup()->getToplevel()->generateFileEmbedded( 
             SF, DevNr );
       }
     } else if ( SF.name() == "peers" ) {
 
@@ -220,14 +220,14 @@ short APPP::generateFile( SystemFile & SF, long DevNr ) {
          << 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 :
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
@@ -12,9 +12,9 @@ State_t PPPRun::detectState( void ) {
     } 
     return Off;
 }
 
-QString PPPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
+QString PPPRun::setMyState( NetworkSetup * , Action_t , bool ) { 
     return QString();
 }
 
 bool PPPRun::isMyPPPDRunning( void ) {
@@ -33,9 +33,9 @@ bool PPPRun::isMyPPPUp( void ) {
       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;
         } 
       }
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
@@ -22,9 +22,9 @@ public :
         { return this; }
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :
 
       bool isMyPPPDRunning( void );
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
@@ -4,9 +4,9 @@
 
 #include "netnodeinterface.h"
 
 static const char * ProfileNeeds[] = 
-    { "connection", 
+    { "NetworkSetup", 
       0
     };
 static const char * ProfileProvides[] = 
     { "fullsetup", 
@@ -15,9 +15,9 @@ static const char * ProfileProvides[] =
 
 /**
  * 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 );
 
@@ -30,10 +30,10 @@ ProfileNetNode::~ProfileNetNode(){
 }
 
 const QString ProfileNetNode::nodeDescription(){
       return tr("\
-<p>Define use of an IP connection.</p>\
-<p>Configure if and when this connection needs to be established</p>\
+<p>Define use of an IP NetworkSetup.</p>\
+<p>Configure if and when this NetworkSetup needs to be established</p>\
 "
 );
 }
 
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
@@ -8,9 +8,9 @@ public :
       // 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;
 } ; 
 
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
@@ -13,11 +13,15 @@
 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 );
@@ -76,9 +80,9 @@ bool ProfileEdit::commit( ProfileData & Data ) {
     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 );
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
@@ -2,15 +2,19 @@
 
 #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;
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
@@ -22,9 +22,9 @@ public :
       State_t detectState( void );
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :
 
       ProfileData * Data;
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
@@ -29,9 +29,9 @@ 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>\
 "
 );
 }
 
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
@@ -9,9 +9,9 @@ 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 );
@@ -60,9 +60,9 @@ State_t USBRun::detectState( void ) {
 
     return Unavailable;
 }
 
-QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
+QString USBRun::setMyState( NetworkSetup * NC, Action_t, bool ) {
 
     InterfaceInfo * I = getInterface();
 
     if( ! I ) {
@@ -96,13 +96,13 @@ InterfaceInfo * USBRun::getInterface( void ) {
       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
       }
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
@@ -24,9 +24,9 @@ public :
       State_t detectState( void );
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :
 
       InterfaceInfo * getInterface( void );
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
@@ -7,15 +7,15 @@ 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.
@@ -24,9 +24,9 @@ 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>\
 "
 );
 }
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
@@ -19,9 +19,9 @@ public :
         { 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
@@ -19,9 +19,9 @@ WLanEdit::WLanEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
 
       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() ) {
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
@@ -10,9 +10,9 @@ 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;
 
@@ -69,9 +69,9 @@ State_t WLanRun::detectState( void ) {
     return Unavailable;
 
 }
 
-QString WLanRun::setMyState( NodeCollection * , Action_t , bool ) {
+QString WLanRun::setMyState( NetworkSetup * , Action_t , bool ) {
 
     // we only handle activate and deactivate
     return QString();
 }
@@ -93,12 +93,12 @@ InterfaceInfo * WLanRun::getInterface( void ) {
 #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;
         }
       }
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
@@ -23,9 +23,9 @@ public :
       State_t detectState( void );
 
 protected :
 
-      QString setMyState( NodeCollection * , Action_t, bool );
+      QString setMyState( NetworkSetup * , Action_t, bool );
 
 private :
 
       InterfaceInfo * getInterface( void );