diff -r dc4cddf5f2f8 -r c2e8c8b73582 realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp	Mon Mar 15 12:42:05 2010 +0200
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp	Wed Mar 31 22:10:27 2010 +0300
@@ -998,7 +998,7 @@
         {
         status = CSIPConcreteProfile::EUnregistrationInProgress;
         }
-    if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn))
+    if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching))
         {
         if(item->LatestProfile().IapId()!= item->UsedProfile().IapId())
             {
@@ -1028,7 +1028,7 @@
         }
 
         
-    if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn) 
+    if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching) 
             && item->IsApnSwitchEnabled())
         {
         PROFILE_DEBUG1("CSIPProfileServerCore::UpdateRegistrationL, SwichEnabled")
@@ -1076,7 +1076,7 @@
                              && item->IsVpnInUse());
     
     const CSIPConcreteProfile* profile = Profile(aProfileId);
-    if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn ) 
+    if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching ) 
         && CheckApnSwitchEnabledL( *profile ) && !item->IsRfsInprogress() && !isVpnInUse )
         {
         PROFILE_DEBUG1("CSIPProfileServerCore::EnableProfileL, SwichEnabled")
@@ -1174,7 +1174,7 @@
             {
             TBool enabled(EFalse);
             TRAPD(error, enabled = CheckApnSwitchEnabledL(item->Profile()))
-            if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn ) 
+            if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching ) 
                         &&enabled && !error)
                 {
                 PROFILE_DEBUG1("CSIPProfileServerCore::RegisterProfiles, SwichEnabled")